[PATCH] fix voyager after topology.c move
authorJames Bottomley <James.Bottomley@SteelEye.com>
Sun, 26 Feb 2006 23:07:45 +0000 (17:07 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Feb 2006 03:10:30 +0000 (19:10 -0800)
Commit 9c869edac591977314323a4eaad5f7633fca684f broke voyager again
rather subtly because it already had its own topology exporting
functions, so now each CPU gets registered twice.

I think we can actually use the generic ones, so I don't propose
reverting it.  The attached should eliminate the voyager topology
functions in favour of the generic ones.

I also added a define to ensure voyager is never hotplug CPU (we don't
have the support in the SMP harness).

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/Kconfig
arch/i386/mach-voyager/voyager_basic.c

index 0afec8566e7bd750743910580c06093481e29daa..af411596a31870fc83c04c5c3ae31dd8f9fd5168 100644 (file)
@@ -733,7 +733,7 @@ config PHYSICAL_START
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-       depends on SMP && HOTPLUG && EXPERIMENTAL
+       depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
        ---help---
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
        ---help---
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
index 6761d294f2605f12fdb8528f55af4352da3429c3..b584060ec004da766c024771b8af916e8d3dc702 100644 (file)
@@ -25,7 +25,6 @@
 #include <linux/sysrq.h>
 #include <linux/smp.h>
 #include <linux/nodemask.h>
 #include <linux/sysrq.h>
 #include <linux/smp.h>
 #include <linux/nodemask.h>
-#include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>
 #include <asm/io.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>
@@ -331,16 +330,3 @@ void machine_power_off(void)
        if (pm_power_off)
                pm_power_off();
 }
        if (pm_power_off)
                pm_power_off();
 }
-
-static struct i386_cpu cpu_devices[NR_CPUS];
-
-static int __init topology_init(void)
-{
-       int i;
-
-       for_each_present_cpu(i)
-               register_cpu(&cpu_devices[i].cpu, i, NULL);
-       return 0;
-}
-
-subsys_initcall(topology_init);