ia64/xen-unstable

changeset 4835:2ba74b440f13

bitkeeper revision 1.1389.15.3 (4280c9f6SME7nqMvzVbZDoxel_CtTA)

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
author cl349@firebug.cl.cam.ac.uk[cl349]
date Tue May 10 14:49:26 2005 +0000 (2005-05-10)
parents 22719724517e 1c402538ca78
children e2f39ab492f6
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 14:48:37 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Tue May 10 14:49:26 2005 +0000
     1.3 @@ -54,6 +54,7 @@
     1.4  #include <asm/desc.h>
     1.5  #include <asm/arch_hooks.h>
     1.6  
     1.7 +#include <mach_apic.h>
     1.8  #include <mach_wakecpu.h>
     1.9  #include <smpboot_hooks.h>
    1.10  
    1.11 @@ -493,19 +494,7 @@ static void __init start_secondary(void 
    1.12  	local_irq_enable();
    1.13  
    1.14  	wmb();
    1.15 -	if (0) {
    1.16 -		char *msg2 = "delay2\n";
    1.17 -		int timeout;
    1.18 -		for (timeout = 0; timeout < 50000; timeout++) {
    1.19 -			udelay(1000);
    1.20 -			if (timeout == 2000) {
    1.21 -				(void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg2), msg2);
    1.22 -				timeout = 0;
    1.23 -			}
    1.24 -		}
    1.25 -	}
    1.26  	cpu_idle();
    1.27 -	return 0;
    1.28  }
    1.29  
    1.30  /*
    1.31 @@ -1111,15 +1100,15 @@ static void __init smp_boot_cpus(unsigne
    1.32  	 * If we couldn't find an SMP configuration at boot time,
    1.33  	 * get out of here now!
    1.34  	 */
    1.35 -	if (!smp_found_config /* && !acpi_lapic) */) {
    1.36 +	if (!smp_found_config && !acpi_lapic) {
    1.37  		printk(KERN_NOTICE "SMP motherboard not detected.\n");
    1.38  		smpboot_clear_io_apic_irqs();
    1.39  #if 0
    1.40  		phys_cpu_present_map = physid_mask_of_physid(0);
    1.41 +#endif
    1.42  		if (APIC_init_uniprocessor())
    1.43  			printk(KERN_NOTICE "Local APIC not detected."
    1.44  					   " Using dummy APIC emulation.\n");
    1.45 -#endif
    1.46  		map_cpu_to_logical_apicid();
    1.47  		return;
    1.48  	}
     2.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h	Tue May 10 14:48:37 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h	Tue May 10 14:49:26 2005 +0000
     2.3 @@ -3,11 +3,7 @@
     2.4  
     2.5  static inline void smpboot_clear_io_apic_irqs(void)
     2.6  {
     2.7 -#if 1
     2.8 -	printk("smpboot_clear_io_apic_irqs\n");
     2.9 -#else
    2.10  	io_apic_irqs = 0;
    2.11 -#endif
    2.12  }
    2.13  
    2.14  static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h	Tue May 10 14:48:37 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 14:49:26 2005 +0000
     3.3 @@ -3,11 +3,7 @@
     3.4  
     3.5  static inline void smpboot_clear_io_apic_irqs(void)
     3.6  {
     3.7 -#if 1
     3.8 -	printk("smpboot_clear_io_apic_irqs\n");
     3.9 -#else
    3.10  	io_apic_irqs = 0;
    3.11 -#endif
    3.12  }
    3.13  
    3.14  static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)