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

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1423.9.2, 2005/05/10 14:31:06+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        smpboot_hooks.h, smpboot.c:
          Also setup IO APIC when running an SMP guest.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 arch/xen/i386/kernel/smpboot.c                      |    2 ++
 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, 2 insertions(+), 8 deletions(-)


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-10 
11:07:07 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c    2005-05-10 
11:07:07 -04:00
@@ -1267,9 +1267,11 @@
 #if 0
        if (nmi_watchdog == NMI_LOCAL_APIC)
                check_nmi_watchdog();
+#endif
 
        smpboot_setup_io_apic();
 
+#if 0
        setup_boot_APIC_clock();
 
        /*
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-10 11:07:07 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h 
2005-05-10 11:07:07 -04:00
@@ -43,16 +43,12 @@
 
 static inline void smpboot_setup_io_apic(void)
 {
-#if 1
-       printk("smpboot_setup_io_apic\n");
-#else
        /*
         * 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-10 11:07:07 -04:00
+++ 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h   
    2005-05-10 11:07:07 -04:00
@@ -43,16 +43,12 @@
 
 static inline void smpboot_setup_io_apic(void)
 {
-#if 1
-       printk("smpboot_setup_io_apic\n");
-#else
        /*
         * 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