aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig53
1 files changed, 18 insertions, 35 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e0edaaa6920a..5d2858119930 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -251,7 +251,7 @@ config X86_ELAN
251 251
252config X86_VOYAGER 252config X86_VOYAGER
253 bool "Voyager (NCR)" 253 bool "Voyager (NCR)"
254 depends on X86_32 && (SMP || BROKEN) 254 depends on X86_32 && (SMP || BROKEN) && !PCI
255 help 255 help
256 Voyager is an MCA-based 32-way capable SMP architecture proprietary 256 Voyager is an MCA-based 32-way capable SMP architecture proprietary
257 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. 257 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -263,7 +263,7 @@ config X86_VOYAGER
263 263
264config X86_NUMAQ 264config X86_NUMAQ
265 bool "NUMAQ (IBM/Sequent)" 265 bool "NUMAQ (IBM/Sequent)"
266 depends on SMP && X86_32 266 depends on SMP && X86_32 && PCI
267 select NUMA 267 select NUMA
268 help 268 help
269 This option is used for getting Linux to run on a (IBM/Sequent) NUMA 269 This option is used for getting Linux to run on a (IBM/Sequent) NUMA
@@ -293,7 +293,7 @@ config X86_BIGSMP
293 293
294config X86_VISWS 294config X86_VISWS
295 bool "SGI 320/540 (Visual Workstation)" 295 bool "SGI 320/540 (Visual Workstation)"
296 depends on X86_32 296 depends on X86_32 && !PCI
297 help 297 help
298 The SGI Visual Workstation series is an IA32-based workstation 298 The SGI Visual Workstation series is an IA32-based workstation
299 based on SGI systems chips with some legacy PC hardware attached. 299 based on SGI systems chips with some legacy PC hardware attached.
@@ -337,7 +337,7 @@ config X86_RDC321X
337config X86_VSMP 337config X86_VSMP
338 bool "Support for ScaleMP vSMP" 338 bool "Support for ScaleMP vSMP"
339 select PARAVIRT 339 select PARAVIRT
340 depends on X86_64 340 depends on X86_64 && !PCI
341 help 341 help
342 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is 342 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
343 supposed to run on these EM64T-based machines. Only choose this option 343 supposed to run on these EM64T-based machines. Only choose this option
@@ -417,35 +417,19 @@ config PARAVIRT_CLOCK
417 417
418endif 418endif
419 419
420config MEMTEST_BOOTPARAM 420config MEMTEST
421 bool "Memtest boot parameter" 421 bool "Memtest"
422 depends on X86_64 422 depends on X86_64
423 default y 423 default y
424 help 424 help
425 This option adds a kernel parameter 'memtest', which allows memtest 425 This option adds a kernel parameter 'memtest', which allows memtest
426 to be disabled at boot. If this option is selected, memtest 426 to be set.
427 functionality can be disabled with memtest=0 on the kernel 427 memtest=0, mean disabled; -- default
428 command line. The purpose of this option is to allow a single 428 memtest=1, mean do 1 test pattern;
429 kernel image to be distributed with memtest built in, but not 429 ...
430 necessarily enabled. 430 memtest=4, mean do 4 test patterns.
431
432 If you are unsure how to answer this question, answer Y. 431 If you are unsure how to answer this question, answer Y.
433 432
434config MEMTEST_BOOTPARAM_VALUE
435 int "Memtest boot parameter default value (0-4)"
436 depends on MEMTEST_BOOTPARAM
437 range 0 4
438 default 0
439 help
440 This option sets the default value for the kernel parameter
441 'memtest', which allows memtest to be disabled at boot. If this
442 option is set to 0 (zero), the memtest kernel parameter will
443 default to 0, disabling memtest at bootup. If this option is
444 set to 4, the memtest kernel parameter will default to 4,
445 enabling memtest at bootup, and use that as pattern number.
446
447 If you are unsure how to answer this question, answer 0.
448
449config ACPI_SRAT 433config ACPI_SRAT
450 def_bool y 434 def_bool y
451 depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) 435 depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
@@ -563,18 +547,18 @@ config IOMMU_HELPER
563 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) 547 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
564 548
565config NR_CPUS 549config NR_CPUS
566 int "Maximum number of CPUs (2-255)" 550 int "Maximum number of CPUs (2-4096)"
567 range 2 255 551 range 2 4096
568 depends on SMP 552 depends on SMP
569 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 553 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
570 default "8" 554 default "8"
571 help 555 help
572 This allows you to specify the maximum number of CPUs which this 556 This allows you to specify the maximum number of CPUs which this
573 kernel will support. The maximum supported value is 255 and the 557 kernel will support. The maximum supported value is 4096 and the
574 minimum value which makes sense is 2. 558 minimum value which makes sense is 2.
575 559
576 This is purely to save memory - each supported CPU adds 560 This is purely to save memory - each supported CPU adds
577 approximately eight kilobytes to the kernel image. 561 approximately one kilobyte to the kernel image.
578 562
579config SCHED_SMT 563config SCHED_SMT
580 bool "SMT (Hyperthreading) scheduler support" 564 bool "SMT (Hyperthreading) scheduler support"
@@ -966,8 +950,8 @@ config NUMA_EMU
966 number of nodes. This is only useful for debugging. 950 number of nodes. This is only useful for debugging.
967 951
968config NODES_SHIFT 952config NODES_SHIFT
969 int "Max num nodes shift(1-15)" 953 int "Max num nodes shift(1-9)"
970 range 1 15 if X86_64 954 range 1 9 if X86_64
971 default "6" if X86_64 955 default "6" if X86_64
972 default "4" if X86_NUMAQ 956 default "4" if X86_NUMAQ
973 default "3" 957 default "3"
@@ -1475,8 +1459,7 @@ endmenu
1475menu "Bus options (PCI etc.)" 1459menu "Bus options (PCI etc.)"
1476 1460
1477config PCI 1461config PCI
1478 bool "PCI support" if !X86_VISWS && !X86_VSMP 1462 bool "PCI support"
1479 depends on !X86_VOYAGER
1480 default y 1463 default y
1481 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) 1464 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
1482 help 1465 help