summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorShai Fultheim <shai@scalemp.com>2012-04-16 10:39:35 +0300
committerIngo Molnar <mingo@kernel.org>2012-05-14 14:42:33 +0200
commitead91d4b8c3b1fb08a73aaa4a191230ecf717ee0 (patch)
treedb906a57cfa3824b8d3f6dcf39a10113076853e7 /arch/x86/Kconfig
parentb2d0b7a061bfddd27155c7dcd53f365d9dc0c7c3 (diff)
x86/vsmp: Fix number of CPUs when vsmp is disabled
In case CONFIG_X86_VSMP is not set, limit the number of CPUs to the number of CPUs of the first board. Also make CONFIG_X86_VSMP depend on CONFIG_SMP, as there's little point in having a vsmp machine with a single CPU. Signed-off-by: Shai Fultheim <shai@scalemp.com> [ido@wizery.com: rebased, fixed minor coding-style issues] Signed-off-by: Ido Yariv <ido@wizery.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f9ed801abaf9..d2599a0ea208 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -376,6 +376,7 @@ config X86_VSMP
select PARAVIRT
depends on X86_64 && PCI
depends on X86_EXTENDED_PLATFORM
+ depends on SMP
---help---
Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
supposed to run on these EM64T-based machines. Only choose this option