[Xen-ia64-devel] [patch 02/16] Initialise xen_start_info earlier in setup_arch()

[Simon Horman <horms@xxxxxxxxxxxx>]

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>
Index: linux-2.6.18-xen.hg/arch/ia64/kernel/setup.c
===================================================================
--- linux-2.6.18-xen.hg.orig/arch/ia64/kernel/setup.c   2007-09-25 
13:56:10.000000000 +0900
+++ linux-2.6.18-xen.hg/arch/ia64/kernel/setup.c        2007-09-25 
13:59:08.000000000 +0900
@@ -442,6 +442,14 @@ early_param("nomca", setup_nomca);
 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);

-- 

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/


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