summaryrefslogtreecommitdiffstats
path: root/arch/i386/Kconfig
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2006-02-27 00:07:45 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-27 04:10:30 +0100
commite18f9b4be430189d79a01a75734bf7cfdc22cc3f (patch)
treeac9629a94a6c151b581ea4616020ca3e966dc8ca /arch/i386/Kconfig
parent[PATCH] fix build on x86_64 with !CONFIG_HOTPLUG_CPU (diff)
downloadlinux-e18f9b4be430189d79a01a75734bf7cfdc22cc3f.tar.xz
linux-e18f9b4be430189d79a01a75734bf7cfdc22cc3f.zip
[PATCH] fix voyager after topology.c move
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>
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r--arch/i386/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 0afec8566e7b..af411596a318 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -733,7 +733,7 @@ config PHYSICAL_START
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.