ia64/xen-unstable

changeset 8797:a3d554557d48

Fix i386 CPU hotplug, and CPU hotplug when maxcpus= kernel boot option is used.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Feb 08 17:24:29 2006 +0100 (2006-02-08)
parents 40c309827ee5
children 6ba371536f5c
files linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c	Wed Feb 08 15:58:01 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c	Wed Feb 08 17:24:29 2006 +0100
     1.3 @@ -147,7 +147,7 @@ static int __init __independent_wallcloc
     1.4  }
     1.5  __setup("independent_wallclock", __independent_wallclock);
     1.6  
     1.7 -int tsc_disable __initdata = 0;
     1.8 +int tsc_disable __devinitdata = 0;
     1.9  
    1.10  static void delay_tsc(unsigned long loops)
    1.11  {
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Wed Feb 08 15:58:01 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Wed Feb 08 17:24:29 2006 +0100
     2.3 @@ -223,8 +223,7 @@ void __init smp_prepare_cpus(unsigned in
     2.4  	cpu_sibling_map[0] = cpumask_of_cpu(0);
     2.5  	cpu_core_map[0]    = cpumask_of_cpu(0);
     2.6  
     2.7 -	if (max_cpus != 0)
     2.8 -		xen_smp_intr_init(0);
     2.9 +	xen_smp_intr_init(0);
    2.10  
    2.11  	for_each_cpu_mask (cpu, cpu_possible_map) {
    2.12  		if (cpu == 0)