[Xen-changelog] [linux-2.6.18-xen] [IA64] Initialise xen_start_info earlier in setup_arch()

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1190921630 21600
# Node ID 571ea7bdf6a629724baf3218d45507e4be496721
# Parent  87e425da49741a7284ee819ffed38a8f51b72dfa
[IA64] Initialise xen_start_info earlier in setup_arch()

xen_start_info needs to be set before efi_init() is called on ia64
because xen_machine_kexec_setup_resources() is indirectly
called by efi_init() and it needs a working is_initial_xendomain();

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 arch/ia64/kernel/setup.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff -r 87e425da4974 -r 571ea7bdf6a6 arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c  Thu Sep 27 12:22:59 2007 -0600
+++ b/arch/ia64/kernel/setup.c  Thu Sep 27 13:33:50 2007 -0600
@@ -442,6 +442,14 @@ void __init
 void __init
 setup_arch (char **cmdline_p)
 {
+#ifdef CONFIG_XEN
+       shared_info_t *s = NULL;
+       if (is_running_on_xen()) {
+               s = HYPERVISOR_shared_info;
+               xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
+       }
+#endif
+
        unw_init();
 
 #ifdef CONFIG_XEN
@@ -528,10 +536,6 @@ setup_arch (char **cmdline_p)
 
 #ifdef CONFIG_XEN
        if (is_running_on_xen()) {
-               shared_info_t *s = HYPERVISOR_shared_info;
-
-               xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
-
                printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%ld "
                       "flags=0x%x\n", s->arch.start_info_pfn,
                       xen_start_info->nr_pages, xen_start_info->flags);

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