aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
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 2fe298297cee..ddddfb8fe091 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -271,15 +271,6 @@ config X86_PC
271 help 271 help
272 Choose this option if your computer is a standard PC or compatible. 272 Choose this option if your computer is a standard PC or compatible.
273 273
274config X86_VSMP
275 bool "Support for ScaleMP vSMP"
276 select PARAVIRT
277 depends on X86_64 && PCI
278 help
279 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
280 supposed to run on these EM64T-based machines. Only choose this option
281 if you have one of these machines.
282
283endchoice 274endchoice
284 275
285config X86_NON_STANDARD 276config X86_NON_STANDARD
@@ -327,6 +318,16 @@ config X86_UV
327 This option is needed in order to support SGI Ultraviolet systems. 318 This option is needed in order to support SGI Ultraviolet systems.
328 If you don't have one of these, you should say N here. 319 If you don't have one of these, you should say N here.
329 320
321config X86_VSMP
322 bool "Support for ScaleMP vSMP"
323 select PARAVIRT
324 depends on X86_64 && PCI
325 depends on X86_NON_STANDARD
326 help
327 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
328 supposed to run on these EM64T-based machines. Only choose this option
329 if you have one of these machines.
330
330config X86_ELAN 331config X86_ELAN
331 bool "AMD Elan" 332 bool "AMD Elan"
332 depends on X86_32 333 depends on X86_32