diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 82 |
1 files changed, 31 insertions, 51 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae7ef2f..5d2858119930 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -26,17 +26,10 @@ config X86 | |||
26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
27 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 27 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
28 | 28 | ||
29 | config DEFCONFIG_LIST | 29 | config ARCH_DEFCONFIG |
30 | string | 30 | string |
31 | depends on X86_32 | 31 | default "arch/x86/configs/i386_defconfig" if X86_32 |
32 | option defconfig_list | 32 | default "arch/x86/configs/x86_64_defconfig" if X86_64 |
33 | default "arch/x86/configs/i386_defconfig" | ||
34 | |||
35 | config DEFCONFIG_LIST | ||
36 | string | ||
37 | depends on X86_64 | ||
38 | option defconfig_list | ||
39 | default "arch/x86/configs/x86_64_defconfig" | ||
40 | 33 | ||
41 | 34 | ||
42 | config GENERIC_LOCKBREAK | 35 | config GENERIC_LOCKBREAK |
@@ -258,7 +251,7 @@ config X86_ELAN | |||
258 | 251 | ||
259 | config X86_VOYAGER | 252 | config X86_VOYAGER |
260 | bool "Voyager (NCR)" | 253 | bool "Voyager (NCR)" |
261 | depends on X86_32 && (SMP || BROKEN) | 254 | depends on X86_32 && (SMP || BROKEN) && !PCI |
262 | help | 255 | help |
263 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
264 | 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. |
@@ -270,7 +263,7 @@ config X86_VOYAGER | |||
270 | 263 | ||
271 | config X86_NUMAQ | 264 | config X86_NUMAQ |
272 | bool "NUMAQ (IBM/Sequent)" | 265 | bool "NUMAQ (IBM/Sequent)" |
273 | depends on SMP && X86_32 | 266 | depends on SMP && X86_32 && PCI |
274 | select NUMA | 267 | select NUMA |
275 | help | 268 | help |
276 | 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 |
@@ -300,7 +293,7 @@ config X86_BIGSMP | |||
300 | 293 | ||
301 | config X86_VISWS | 294 | config X86_VISWS |
302 | bool "SGI 320/540 (Visual Workstation)" | 295 | bool "SGI 320/540 (Visual Workstation)" |
303 | depends on X86_32 | 296 | depends on X86_32 && !PCI |
304 | help | 297 | help |
305 | The SGI Visual Workstation series is an IA32-based workstation | 298 | The SGI Visual Workstation series is an IA32-based workstation |
306 | based on SGI systems chips with some legacy PC hardware attached. | 299 | based on SGI systems chips with some legacy PC hardware attached. |
@@ -344,7 +337,7 @@ config X86_RDC321X | |||
344 | config X86_VSMP | 337 | config X86_VSMP |
345 | bool "Support for ScaleMP vSMP" | 338 | bool "Support for ScaleMP vSMP" |
346 | select PARAVIRT | 339 | select PARAVIRT |
347 | depends on X86_64 | 340 | depends on X86_64 && !PCI |
348 | help | 341 | help |
349 | 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 |
350 | 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 |
@@ -390,6 +383,7 @@ config VMI | |||
390 | config KVM_CLOCK | 383 | config KVM_CLOCK |
391 | bool "KVM paravirtualized clock" | 384 | bool "KVM paravirtualized clock" |
392 | select PARAVIRT | 385 | select PARAVIRT |
386 | select PARAVIRT_CLOCK | ||
393 | depends on !(X86_VISWS || X86_VOYAGER) | 387 | depends on !(X86_VISWS || X86_VOYAGER) |
394 | help | 388 | help |
395 | Turning on this option will allow you to run a paravirtualized clock | 389 | Turning on this option will allow you to run a paravirtualized clock |
@@ -417,37 +411,25 @@ config PARAVIRT | |||
417 | over full virtualization. However, when run without a hypervisor | 411 | over full virtualization. However, when run without a hypervisor |
418 | the kernel is theoretically slower and slightly larger. | 412 | the kernel is theoretically slower and slightly larger. |
419 | 413 | ||
414 | config PARAVIRT_CLOCK | ||
415 | bool | ||
416 | default n | ||
417 | |||
420 | endif | 418 | endif |
421 | 419 | ||
422 | config MEMTEST_BOOTPARAM | 420 | config MEMTEST |
423 | bool "Memtest boot parameter" | 421 | bool "Memtest" |
424 | depends on X86_64 | 422 | depends on X86_64 |
425 | default y | 423 | default y |
426 | help | 424 | help |
427 | This option adds a kernel parameter 'memtest', which allows memtest | 425 | This option adds a kernel parameter 'memtest', which allows memtest |
428 | to be disabled at boot. If this option is selected, memtest | 426 | to be set. |
429 | functionality can be disabled with memtest=0 on the kernel | 427 | memtest=0, mean disabled; -- default |
430 | command line. The purpose of this option is to allow a single | 428 | memtest=1, mean do 1 test pattern; |
431 | kernel image to be distributed with memtest built in, but not | 429 | ... |
432 | necessarily enabled. | 430 | memtest=4, mean do 4 test patterns. |
433 | |||
434 | If you are unsure how to answer this question, answer Y. | 431 | If you are unsure how to answer this question, answer Y. |
435 | 432 | ||
436 | config MEMTEST_BOOTPARAM_VALUE | ||
437 | int "Memtest boot parameter default value (0-4)" | ||
438 | depends on MEMTEST_BOOTPARAM | ||
439 | range 0 4 | ||
440 | default 0 | ||
441 | help | ||
442 | This option sets the default value for the kernel parameter | ||
443 | 'memtest', which allows memtest to be disabled at boot. If this | ||
444 | option is set to 0 (zero), the memtest kernel parameter will | ||
445 | default to 0, disabling memtest at bootup. If this option is | ||
446 | set to 4, the memtest kernel parameter will default to 4, | ||
447 | enabling memtest at bootup, and use that as pattern number. | ||
448 | |||
449 | If you are unsure how to answer this question, answer 0. | ||
450 | |||
451 | config ACPI_SRAT | 433 | config ACPI_SRAT |
452 | def_bool y | 434 | def_bool y |
453 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 435 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |
@@ -565,18 +547,18 @@ config IOMMU_HELPER | |||
565 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | 547 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) |
566 | 548 | ||
567 | config NR_CPUS | 549 | config NR_CPUS |
568 | int "Maximum number of CPUs (2-255)" | 550 | int "Maximum number of CPUs (2-4096)" |
569 | range 2 255 | 551 | range 2 4096 |
570 | depends on SMP | 552 | depends on SMP |
571 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 553 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
572 | default "8" | 554 | default "8" |
573 | help | 555 | help |
574 | 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 |
575 | kernel will support. The maximum supported value is 255 and the | 557 | kernel will support. The maximum supported value is 4096 and the |
576 | minimum value which makes sense is 2. | 558 | minimum value which makes sense is 2. |
577 | 559 | ||
578 | This is purely to save memory - each supported CPU adds | 560 | This is purely to save memory - each supported CPU adds |
579 | approximately eight kilobytes to the kernel image. | 561 | approximately one kilobyte to the kernel image. |
580 | 562 | ||
581 | config SCHED_SMT | 563 | config SCHED_SMT |
582 | bool "SMT (Hyperthreading) scheduler support" | 564 | bool "SMT (Hyperthreading) scheduler support" |
@@ -968,8 +950,8 @@ config NUMA_EMU | |||
968 | number of nodes. This is only useful for debugging. | 950 | number of nodes. This is only useful for debugging. |
969 | 951 | ||
970 | config NODES_SHIFT | 952 | config NODES_SHIFT |
971 | int "Max num nodes shift(1-15)" | 953 | int "Max num nodes shift(1-9)" |
972 | range 1 15 if X86_64 | 954 | range 1 9 if X86_64 |
973 | default "6" if X86_64 | 955 | default "6" if X86_64 |
974 | default "4" if X86_NUMAQ | 956 | default "4" if X86_NUMAQ |
975 | default "3" | 957 | default "3" |
@@ -1477,8 +1459,7 @@ endmenu | |||
1477 | menu "Bus options (PCI etc.)" | 1459 | menu "Bus options (PCI etc.)" |
1478 | 1460 | ||
1479 | config PCI | 1461 | config PCI |
1480 | bool "PCI support" if !X86_VISWS && !X86_VSMP | 1462 | bool "PCI support" |
1481 | depends on !X86_VOYAGER | ||
1482 | default y | 1463 | default y |
1483 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1464 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
1484 | help | 1465 | help |
@@ -1515,13 +1496,13 @@ config PCI_GOMMCONFIG | |||
1515 | config PCI_GODIRECT | 1496 | config PCI_GODIRECT |
1516 | bool "Direct" | 1497 | bool "Direct" |
1517 | 1498 | ||
1518 | config PCI_GOANY | ||
1519 | bool "Any" | ||
1520 | |||
1521 | config PCI_GOOLPC | 1499 | config PCI_GOOLPC |
1522 | bool "OLPC" | 1500 | bool "OLPC" |
1523 | depends on OLPC | 1501 | depends on OLPC |
1524 | 1502 | ||
1503 | config PCI_GOANY | ||
1504 | bool "Any" | ||
1505 | |||
1525 | endchoice | 1506 | endchoice |
1526 | 1507 | ||
1527 | config PCI_BIOS | 1508 | config PCI_BIOS |
@@ -1538,9 +1519,8 @@ config PCI_MMCONFIG | |||
1538 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1519 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1539 | 1520 | ||
1540 | config PCI_OLPC | 1521 | config PCI_OLPC |
1541 | bool | 1522 | def_bool y |
1542 | depends on PCI && PCI_GOOLPC | 1523 | depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) |
1543 | default y | ||
1544 | 1524 | ||
1545 | config PCI_DOMAINS | 1525 | config PCI_DOMAINS |
1546 | def_bool y | 1526 | def_bool y |