Commit 6a48565e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 9c398017

arch/x86/Kconfig

+10 −9
Original line number Diff line number Diff line
@@ -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