[Xen-changelog] Fix i386 CPU hotplug, and CPU hotplug when maxcpus= kernel boot option is used.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID a3d554557d48ab302eb07a1bcca975d61f0ceac2
# Parent  40c309827ee5b8091b53dc8004188770f28aef8e
Fix i386 CPU hotplug, and CPU hotplug when maxcpus= kernel boot option is used.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 40c309827ee5 -r a3d554557d48 
linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c  Wed Feb  8 15:58:01 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c  Wed Feb  8 16:24:29 2006
@@ -147,7 +147,7 @@
 }
 __setup("independent_wallclock", __independent_wallclock);
 
-int tsc_disable __initdata = 0;
+int tsc_disable __devinitdata = 0;
 
 static void delay_tsc(unsigned long loops)
 {
diff -r 40c309827ee5 -r a3d554557d48 
linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Wed Feb  8 15:58:01 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Wed Feb  8 16:24:29 2006
@@ -223,8 +223,7 @@
        cpu_sibling_map[0] = cpumask_of_cpu(0);
        cpu_core_map[0]    = cpumask_of_cpu(0);
 
-       if (max_cpus != 0)
-               xen_smp_intr_init(0);
+       xen_smp_intr_init(0);
 
        for_each_cpu_mask (cpu, cpu_possible_map) {
                if (cpu == 0)

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