ia64/xen-unstable

changeset 4827:1311d7d58c41

bitkeeper revision 1.1389.5.51 (4280b7c3zTKZxZNOTWdOco0qdNV2yQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
author cl349@firebug.cl.cam.ac.uk
date Tue May 10 13:31:47 2005 +0000 (2005-05-10)
parents 85c2ccd45860 516b33672bc0
children 4f1ddb677017
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Tue May 10 13:19:12 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Tue May 10 13:31:47 2005 +0000
     1.3 @@ -1267,9 +1267,11 @@ static void __init smp_boot_cpus(unsigne
     1.4  #if 0
     1.5  	if (nmi_watchdog == NMI_LOCAL_APIC)
     1.6  		check_nmi_watchdog();
     1.7 +#endif
     1.8  
     1.9  	smpboot_setup_io_apic();
    1.10  
    1.11 +#if 0
    1.12  	setup_boot_APIC_clock();
    1.13  
    1.14  	/*
     2.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h	Tue May 10 13:19:12 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h	Tue May 10 13:31:47 2005 +0000
     2.3 @@ -43,16 +43,12 @@ static inline void smpboot_restore_warm_
     2.4  
     2.5  static inline void smpboot_setup_io_apic(void)
     2.6  {
     2.7 -#if 1
     2.8 -	printk("smpboot_setup_io_apic\n");
     2.9 -#else
    2.10  	/*
    2.11  	 * Here we can be sure that there is an IO-APIC in the system. Let's
    2.12  	 * go and set it up:
    2.13  	 */
    2.14  	if (!skip_ioapic_setup && nr_ioapics)
    2.15  		setup_IO_APIC();
    2.16 -#endif
    2.17  }
    2.18  
    2.19  
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h	Tue May 10 13:19:12 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h	Tue May 10 13:31:47 2005 +0000
     3.3 @@ -43,16 +43,12 @@ static inline void smpboot_restore_warm_
     3.4  
     3.5  static inline void smpboot_setup_io_apic(void)
     3.6  {
     3.7 -#if 1
     3.8 -	printk("smpboot_setup_io_apic\n");
     3.9 -#else
    3.10  	/*
    3.11  	 * Here we can be sure that there is an IO-APIC in the system. Let's
    3.12  	 * go and set it up:
    3.13  	 */
    3.14  	if (!skip_ioapic_setup && nr_ioapics)
    3.15  		setup_IO_APIC();
    3.16 -#endif
    3.17  }
    3.18  
    3.19