[Xen-changelog] Move misplaced CONFIG_KEXEC code chunk in setup-xen.c to its proper location.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 131051c090088dcbeedde71b41a6cb9e4fd60c69
# Parent  8b39930c70d5cf513c6d87163f0dfbc6b6e068c7
Move misplaced CONFIG_KEXEC code chunk in setup-xen.c to its proper location.

From: Jan Beulich

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 8b39930c70d5 -r 131051c09008 
linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Thu Apr  6 13:58:55 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Thu Apr  6 14:22:46 2006
@@ -1317,6 +1317,11 @@
                }
        }
 #endif
+#ifdef CONFIG_KEXEC
+       if (crashk_res.start != crashk_res.end)
+               reserve_bootmem(crashk_res.start,
+                       crashk_res.end - crashk_res.start + 1);
+#endif
 
        if (!xen_feature(XENFEAT_auto_translated_physmap))
                phys_to_machine_mapping =
@@ -1435,11 +1440,6 @@
 #endif
                }
        }
-#endif
-#ifdef CONFIG_KEXEC
-       if (crashk_res.start != crashk_res.end)
-               reserve_bootmem(crashk_res.start,
-                       crashk_res.end - crashk_res.start + 1);
 #endif
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog