[Xen-changelog] smpboot_hooks.h, smpboot.c:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1444, 2005/05/11 18:42:15+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        smpboot_hooks.h, smpboot.c:
          Fix domU build after ACPI changes.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 arch/xen/i386/kernel/smpboot.c                      |    8 +++++++-
 include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h   |    4 ++++
 include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h |    4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c    2005-05-11 
17:05:06 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c    2005-05-11 
17:05:06 -04:00
@@ -54,7 +54,9 @@
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 
-#include <mach_apic.h>
+#ifndef CONFIG_X86_IO_APIC
+#define Dprintk(args...)
+#endif
 #include <mach_wakecpu.h>
 #include <smpboot_hooks.h>
 
@@ -1096,6 +1098,7 @@
        cpus_clear(cpu_sibling_map[0]);
        cpu_set(0, cpu_sibling_map[0]);
 
+#ifdef CONFIG_X86_IO_APIC
        /*
         * If we couldn't find an SMP configuration at boot time,
         * get out of here now!
@@ -1106,12 +1109,15 @@
 #if 0
                phys_cpu_present_map = physid_mask_of_physid(0);
 #endif
+#ifdef CONFIG_X86_LOCAL_APIC
                if (APIC_init_uniprocessor())
                        printk(KERN_NOTICE "Local APIC not detected."
                                           " Using dummy APIC emulation.\n");
+#endif
                map_cpu_to_logical_apicid();
                return;
        }
+#endif
 
 #if 0
        /*
diff -Nru 
a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h 
2005-05-11 17:05:06 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h 
2005-05-11 17:05:06 -04:00
@@ -3,7 +3,9 @@
 
 static inline void smpboot_clear_io_apic_irqs(void)
 {
+#ifdef CONFIG_X86_IO_APIC
        io_apic_irqs = 0;
+#endif
 }
 
 static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
@@ -39,12 +41,14 @@
 
 static inline void smpboot_setup_io_apic(void)
 {
+#ifdef CONFIG_X86_IO_APIC
        /*
         * Here we can be sure that there is an IO-APIC in the system. Let's
         * go and set it up:
         */
        if (!skip_ioapic_setup && nr_ioapics)
                setup_IO_APIC();
+#endif
 }
 
 
diff -Nru 
a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
--- 
a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h   
    2005-05-11 17:05:06 -04:00
+++ 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h   
    2005-05-11 17:05:06 -04:00
@@ -3,7 +3,9 @@
 
 static inline void smpboot_clear_io_apic_irqs(void)
 {
+#ifdef CONFIG_X86_IO_APIC
        io_apic_irqs = 0;
+#endif
 }
 
 static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
@@ -39,12 +41,14 @@
 
 static inline void smpboot_setup_io_apic(void)
 {
+#ifdef CONFIG_X86_IO_APIC
        /*
         * Here we can be sure that there is an IO-APIC in the system. Let's
         * go and set it up:
         */
        if (!skip_ioapic_setup && nr_ioapics)
                setup_IO_APIC();
+#endif
 }
 
 

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