Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / arch / i386 / kernel / topology.c

diff --git a/arch/i386/kernel/topology.c b/arch/i386/kernel/topology.c
index 67a0e1baa28b2467a5a540772e6c0d88927c9ea8..296355292c7c56433df1c849e93851985a7798d3 100644 (file)
--- a/arch/i386/kernel/topology.c
+++ b/arch/i386/kernel/topology.c
@@ -41,6 +41,15 @@ int arch_register_cpu(int num){
                parent = &node_devices[node].node;
 #endif /* CONFIG_NUMA */
 
+       /*
+        * CPU0 cannot be offlined due to several
+        * restrictions and assumptions in kernel. This basically
+        * doesnt add a control file, one cannot attempt to offline
+        * BSP.
+        */
+       if (!num)
+               cpu_devices[num].cpu.no_control = 1;
+
        return register_cpu(&cpu_devices[num].cpu, num, parent);
 }