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>
This commit is contained in:
Ingo Molnar
2009-01-27 18:29:13 +01:00
parent 9c39801763
commit 6a48565ed6

View File

@@ -271,15 +271,6 @@ config X86_PC
help help
Choose this option if your computer is a standard PC or compatible. 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 endchoice
config X86_NON_STANDARD config X86_NON_STANDARD
@@ -327,6 +318,16 @@ config X86_UV
This option is needed in order to support SGI Ultraviolet systems. This option is needed in order to support SGI Ultraviolet systems.
If you don't have one of these, you should say N here. 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 config X86_ELAN
bool "AMD Elan" bool "AMD Elan"
depends on X86_32 depends on X86_32