summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-27 18:29:13 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-29 14:17:18 +0100
commit6a48565ed6ac76f351def25cd5e9f181331065f6 (patch)
treebb2bce958a16dc2e4fe5eee9a3077d298c79f851 /arch/x86/Kconfig
parent9c39801763ed6e08ea8bc694c5ab936643a2b763 (diff)
x86: move X86_VSMP from subarch menu
Move X86_VSMP out of the subarch menu - this way it can be enabled together with standard PC support as well, in the same kernel. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig19
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2fe298297ce..ddddfb8fe09 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -271,15 +271,6 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
-config X86_VSMP
- bool "Support for ScaleMP vSMP"
- select PARAVIRT
- depends on X86_64 && PCI
- 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
- if you have one of these machines.
-
endchoice
config X86_NON_STANDARD
@@ -327,6 +318,16 @@ config X86_UV
This option is needed in order to support SGI Ultraviolet systems.
If you don't have one of these, you should say N here.
+config X86_VSMP
+ bool "Support for ScaleMP vSMP"
+ select PARAVIRT
+ depends on X86_64 && PCI
+ depends on X86_NON_STANDARD
+ 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
+ if you have one of these machines.
+
config X86_ELAN
bool "AMD Elan"
depends on X86_32