diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 73 |
1 files changed, 57 insertions, 16 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5c4c8d7a46c..2a59dbb2824 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -54,9 +54,6 @@ config STACKTRACE_SUPPORT | |||
54 | config HAVE_LATENCYTOP_SUPPORT | 54 | config HAVE_LATENCYTOP_SUPPORT |
55 | def_bool y | 55 | def_bool y |
56 | 56 | ||
57 | config SEMAPHORE_SLEEPERS | ||
58 | def_bool y | ||
59 | |||
60 | config FAST_CMPXCHG_LOCAL | 57 | config FAST_CMPXCHG_LOCAL |
61 | bool | 58 | bool |
62 | default y | 59 | default y |
@@ -118,7 +115,7 @@ config ARCH_HAS_CPU_RELAX | |||
118 | def_bool y | 115 | def_bool y |
119 | 116 | ||
120 | config HAVE_SETUP_PER_CPU_AREA | 117 | config HAVE_SETUP_PER_CPU_AREA |
121 | def_bool X86_64 | 118 | def_bool X86_64 || (X86_SMP && !X86_VOYAGER) |
122 | 119 | ||
123 | config ARCH_HIBERNATION_POSSIBLE | 120 | config ARCH_HIBERNATION_POSSIBLE |
124 | def_bool y | 121 | def_bool y |
@@ -172,7 +169,7 @@ config X86_64_SMP | |||
172 | config X86_HT | 169 | config X86_HT |
173 | bool | 170 | bool |
174 | depends on SMP | 171 | depends on SMP |
175 | depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8) | 172 | depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || X86_64 |
176 | default y | 173 | default y |
177 | 174 | ||
178 | config X86_BIOS_REBOOT | 175 | config X86_BIOS_REBOOT |
@@ -182,7 +179,7 @@ config X86_BIOS_REBOOT | |||
182 | 179 | ||
183 | config X86_TRAMPOLINE | 180 | config X86_TRAMPOLINE |
184 | bool | 181 | bool |
185 | depends on X86_SMP || (X86_VOYAGER && SMP) | 182 | depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP) |
186 | default y | 183 | default y |
187 | 184 | ||
188 | config KTIME_SCALAR | 185 | config KTIME_SCALAR |
@@ -242,8 +239,7 @@ config X86_ELAN | |||
242 | 239 | ||
243 | config X86_VOYAGER | 240 | config X86_VOYAGER |
244 | bool "Voyager (NCR)" | 241 | bool "Voyager (NCR)" |
245 | depends on X86_32 | 242 | depends on X86_32 && (SMP || BROKEN) |
246 | select SMP if !BROKEN | ||
247 | help | 243 | help |
248 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 244 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
249 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | 245 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
@@ -255,9 +251,8 @@ config X86_VOYAGER | |||
255 | 251 | ||
256 | config X86_NUMAQ | 252 | config X86_NUMAQ |
257 | bool "NUMAQ (IBM/Sequent)" | 253 | bool "NUMAQ (IBM/Sequent)" |
258 | select SMP | 254 | depends on SMP && X86_32 |
259 | select NUMA | 255 | select NUMA |
260 | depends on X86_32 | ||
261 | help | 256 | help |
262 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA | 257 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA |
263 | multiquad box. This changes the way that processors are bootstrapped, | 258 | multiquad box. This changes the way that processors are bootstrapped, |
@@ -328,8 +323,9 @@ config X86_RDC321X | |||
328 | 323 | ||
329 | config X86_VSMP | 324 | config X86_VSMP |
330 | bool "Support for ScaleMP vSMP" | 325 | bool "Support for ScaleMP vSMP" |
331 | depends on X86_64 && PCI | 326 | select PARAVIRT |
332 | help | 327 | depends on X86_64 |
328 | help | ||
333 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | 329 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is |
334 | supposed to run on these EM64T-based machines. Only choose this option | 330 | supposed to run on these EM64T-based machines. Only choose this option |
335 | if you have one of these machines. | 331 | if you have one of these machines. |
@@ -384,6 +380,35 @@ config PARAVIRT | |||
384 | 380 | ||
385 | endif | 381 | endif |
386 | 382 | ||
383 | config MEMTEST_BOOTPARAM | ||
384 | bool "Memtest boot parameter" | ||
385 | depends on X86_64 | ||
386 | default y | ||
387 | help | ||
388 | This option adds a kernel parameter 'memtest', which allows memtest | ||
389 | to be disabled at boot. If this option is selected, memtest | ||
390 | functionality can be disabled with memtest=0 on the kernel | ||
391 | command line. The purpose of this option is to allow a single | ||
392 | kernel image to be distributed with memtest built in, but not | ||
393 | necessarily enabled. | ||
394 | |||
395 | If you are unsure how to answer this question, answer Y. | ||
396 | |||
397 | config MEMTEST_BOOTPARAM_VALUE | ||
398 | int "Memtest boot parameter default value (0-4)" | ||
399 | depends on MEMTEST_BOOTPARAM | ||
400 | range 0 4 | ||
401 | default 0 | ||
402 | help | ||
403 | This option sets the default value for the kernel parameter | ||
404 | 'memtest', which allows memtest to be disabled at boot. If this | ||
405 | option is set to 0 (zero), the memtest kernel parameter will | ||
406 | default to 0, disabling memtest at bootup. If this option is | ||
407 | set to 4, the memtest kernel parameter will default to 4, | ||
408 | enabling memtest at bootup, and use that as pattern number. | ||
409 | |||
410 | If you are unsure how to answer this question, answer 0. | ||
411 | |||
387 | config ACPI_SRAT | 412 | config ACPI_SRAT |
388 | def_bool y | 413 | def_bool y |
389 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 414 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |
@@ -508,7 +533,7 @@ config NR_CPUS | |||
508 | 533 | ||
509 | config SCHED_SMT | 534 | config SCHED_SMT |
510 | bool "SMT (Hyperthreading) scheduler support" | 535 | bool "SMT (Hyperthreading) scheduler support" |
511 | depends on (X86_64 && SMP) || (X86_32 && X86_HT) | 536 | depends on X86_HT |
512 | help | 537 | help |
513 | SMT scheduler support improves the CPU scheduler's decision making | 538 | SMT scheduler support improves the CPU scheduler's decision making |
514 | when dealing with Intel Pentium 4 chips with HyperThreading at a | 539 | when dealing with Intel Pentium 4 chips with HyperThreading at a |
@@ -518,7 +543,7 @@ config SCHED_SMT | |||
518 | config SCHED_MC | 543 | config SCHED_MC |
519 | def_bool y | 544 | def_bool y |
520 | prompt "Multi-core scheduler support" | 545 | prompt "Multi-core scheduler support" |
521 | depends on (X86_64 && SMP) || (X86_32 && X86_HT) | 546 | depends on X86_HT |
522 | help | 547 | help |
523 | Multi-core scheduler support improves the CPU scheduler's decision | 548 | Multi-core scheduler support improves the CPU scheduler's decision |
524 | making when dealing with multi-core CPU chips at a cost of slightly | 549 | making when dealing with multi-core CPU chips at a cost of slightly |
@@ -887,7 +912,7 @@ config NUMA_EMU | |||
887 | number of nodes. This is only useful for debugging. | 912 | number of nodes. This is only useful for debugging. |
888 | 913 | ||
889 | config NODES_SHIFT | 914 | config NODES_SHIFT |
890 | int | 915 | int "Max num nodes shift(1-15)" |
891 | range 1 15 if X86_64 | 916 | range 1 15 if X86_64 |
892 | default "6" if X86_64 | 917 | default "6" if X86_64 |
893 | default "4" if X86_NUMAQ | 918 | default "4" if X86_NUMAQ |
@@ -1011,6 +1036,21 @@ config MTRR | |||
1011 | 1036 | ||
1012 | See <file:Documentation/mtrr.txt> for more information. | 1037 | See <file:Documentation/mtrr.txt> for more information. |
1013 | 1038 | ||
1039 | config X86_PAT | ||
1040 | def_bool y | ||
1041 | prompt "x86 PAT support" | ||
1042 | depends on MTRR && NONPROMISC_DEVMEM | ||
1043 | help | ||
1044 | Use PAT attributes to setup page level cache control. | ||
1045 | |||
1046 | PATs are the modern equivalents of MTRRs and are much more | ||
1047 | flexible than MTRRs. | ||
1048 | |||
1049 | Say N here if you see bootup problems (boot crash, boot hang, | ||
1050 | spontaneous reboots) or a non-working video driver. | ||
1051 | |||
1052 | If unsure, say Y. | ||
1053 | |||
1014 | config EFI | 1054 | config EFI |
1015 | def_bool n | 1055 | def_bool n |
1016 | prompt "EFI runtime service support" | 1056 | prompt "EFI runtime service support" |
@@ -1079,6 +1119,7 @@ source kernel/Kconfig.hz | |||
1079 | 1119 | ||
1080 | config KEXEC | 1120 | config KEXEC |
1081 | bool "kexec system call" | 1121 | bool "kexec system call" |
1122 | depends on X86_64 || X86_BIOS_REBOOT | ||
1082 | help | 1123 | help |
1083 | kexec is a system call that implements the ability to shutdown your | 1124 | kexec is a system call that implements the ability to shutdown your |
1084 | current kernel, and to start another kernel. It is like a reboot | 1125 | current kernel, and to start another kernel. It is like a reboot |
@@ -1380,7 +1421,7 @@ endmenu | |||
1380 | menu "Bus options (PCI etc.)" | 1421 | menu "Bus options (PCI etc.)" |
1381 | 1422 | ||
1382 | config PCI | 1423 | config PCI |
1383 | bool "PCI support" if !X86_VISWS | 1424 | bool "PCI support" if !X86_VISWS && !X86_VSMP |
1384 | depends on !X86_VOYAGER | 1425 | depends on !X86_VOYAGER |
1385 | default y | 1426 | default y |
1386 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1427 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |