From: Christian Limpach Date: Fri, 12 Jan 2007 15:32:03 +0000 (+0000) Subject: [linux x86_64] Disable smp alternatives. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15371^2~137 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e6fbb9393117611170308792f274af181e29215;p=xen.git [linux x86_64] Disable smp alternatives. Signed-off-by: Christian Limpach --- diff --git a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c index 9abe4251f9..33ef1a553d 100644 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c @@ -392,8 +392,10 @@ void __cpu_die(unsigned int cpu) xen_smp_intr_exit(cpu); +#if defined(__i386__) if (num_online_cpus() == 1) alternatives_smp_switch(0); +#endif } #else /* !CONFIG_HOTPLUG_CPU */ @@ -418,8 +420,10 @@ int __devinit __cpu_up(unsigned int cpu) if (rc) return rc; +#if defined(__i386__) if (num_online_cpus() == 1) alternatives_smp_switch(1); +#endif /* This must be done before setting cpu_online_map */ set_cpu_sibling_map(cpu);