diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 220 |
1 files changed, 99 insertions, 121 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 9c39095b33fc..80291f749b66 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -34,8 +34,8 @@ config X86 | |||
34 | select HAVE_FUNCTION_TRACER | 34 | select HAVE_FUNCTION_TRACER |
35 | select HAVE_FUNCTION_GRAPH_TRACER | 35 | select HAVE_FUNCTION_GRAPH_TRACER |
36 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | 36 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST |
37 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 37 | select HAVE_KVM |
38 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 38 | select HAVE_ARCH_KGDB |
39 | select HAVE_ARCH_TRACEHOOK | 39 | select HAVE_ARCH_TRACEHOOK |
40 | select HAVE_GENERIC_DMA_COHERENT if X86_32 | 40 | select HAVE_GENERIC_DMA_COHERENT if X86_32 |
41 | select HAVE_EFFICIENT_UNALIGNED_ACCESS | 41 | select HAVE_EFFICIENT_UNALIGNED_ACCESS |
@@ -133,18 +133,17 @@ config ARCH_HAS_CACHE_LINE_SIZE | |||
133 | def_bool y | 133 | def_bool y |
134 | 134 | ||
135 | config HAVE_SETUP_PER_CPU_AREA | 135 | config HAVE_SETUP_PER_CPU_AREA |
136 | def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER) | 136 | def_bool y |
137 | 137 | ||
138 | config HAVE_CPUMASK_OF_CPU_MAP | 138 | config HAVE_CPUMASK_OF_CPU_MAP |
139 | def_bool X86_64_SMP | 139 | def_bool X86_64_SMP |
140 | 140 | ||
141 | config ARCH_HIBERNATION_POSSIBLE | 141 | config ARCH_HIBERNATION_POSSIBLE |
142 | def_bool y | 142 | def_bool y |
143 | depends on !SMP || !X86_VOYAGER | 143 | depends on !SMP |
144 | 144 | ||
145 | config ARCH_SUSPEND_POSSIBLE | 145 | config ARCH_SUSPEND_POSSIBLE |
146 | def_bool y | 146 | def_bool y |
147 | depends on !X86_VOYAGER | ||
148 | 147 | ||
149 | config ZONE_DMA32 | 148 | config ZONE_DMA32 |
150 | bool | 149 | bool |
@@ -174,11 +173,6 @@ config GENERIC_PENDING_IRQ | |||
174 | depends on GENERIC_HARDIRQS && SMP | 173 | depends on GENERIC_HARDIRQS && SMP |
175 | default y | 174 | default y |
176 | 175 | ||
177 | config X86_SMP | ||
178 | bool | ||
179 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) | ||
180 | default y | ||
181 | |||
182 | config USE_GENERIC_SMP_HELPERS | 176 | config USE_GENERIC_SMP_HELPERS |
183 | def_bool y | 177 | def_bool y |
184 | depends on SMP | 178 | depends on SMP |
@@ -194,17 +188,11 @@ config X86_64_SMP | |||
194 | config X86_HT | 188 | config X86_HT |
195 | bool | 189 | bool |
196 | depends on SMP | 190 | depends on SMP |
197 | depends on (X86_32 && !X86_VOYAGER) || X86_64 | ||
198 | default y | ||
199 | |||
200 | config X86_BIOS_REBOOT | ||
201 | bool | ||
202 | depends on !X86_VOYAGER | ||
203 | default y | 191 | default y |
204 | 192 | ||
205 | config X86_TRAMPOLINE | 193 | config X86_TRAMPOLINE |
206 | bool | 194 | bool |
207 | depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP) | 195 | depends on SMP || (64BIT && ACPI_SLEEP) |
208 | default y | 196 | default y |
209 | 197 | ||
210 | config KTIME_SCALAR | 198 | config KTIME_SCALAR |
@@ -244,10 +232,6 @@ config SMP | |||
244 | 232 | ||
245 | If you don't know what to do here, say N. | 233 | If you don't know what to do here, say N. |
246 | 234 | ||
247 | config X86_HAS_BOOT_CPU_ID | ||
248 | def_bool y | ||
249 | depends on X86_VOYAGER | ||
250 | |||
251 | config SPARSE_IRQ | 235 | config SPARSE_IRQ |
252 | bool "Support sparse irq numbering" | 236 | bool "Support sparse irq numbering" |
253 | depends on PCI_MSI || HT_IRQ | 237 | depends on PCI_MSI || HT_IRQ |
@@ -270,10 +254,6 @@ config NUMA_MIGRATE_IRQ_DESC | |||
270 | 254 | ||
271 | If you don't know what to do here, say N. | 255 | If you don't know what to do here, say N. |
272 | 256 | ||
273 | config X86_FIND_SMP_CONFIG | ||
274 | def_bool y | ||
275 | depends on X86_MPPARSE || X86_VOYAGER | ||
276 | |||
277 | config X86_MPPARSE | 257 | config X86_MPPARSE |
278 | bool "Enable MPS table" if ACPI | 258 | bool "Enable MPS table" if ACPI |
279 | default y | 259 | default y |
@@ -282,18 +262,71 @@ config X86_MPPARSE | |||
282 | For old smp systems that do not have proper acpi support. Newer systems | 262 | For old smp systems that do not have proper acpi support. Newer systems |
283 | (esp with 64bit cpus) with acpi support, MADT and DSDT will override it | 263 | (esp with 64bit cpus) with acpi support, MADT and DSDT will override it |
284 | 264 | ||
285 | choice | 265 | config X86_BIGSMP |
286 | prompt "Subarchitecture Type" | 266 | bool "Support for big SMP systems with more than 8 CPUs" |
287 | default X86_PC | 267 | depends on X86_32 && SMP |
268 | help | ||
269 | This option is needed for the systems that have more than 8 CPUs | ||
270 | |||
271 | config X86_NON_STANDARD | ||
272 | bool "Support for non-standard x86 platforms" | ||
273 | help | ||
274 | If you disable this option then the kernel will only support | ||
275 | standard PC platforms. (which covers the vast majority of | ||
276 | systems out there.) | ||
288 | 277 | ||
289 | config X86_PC | 278 | If you enable this option then you'll be able to select a number |
290 | bool "PC-compatible" | 279 | of less common non-PC x86 platforms: VisWS, RDC321, SGI/UV. |
280 | |||
281 | If you have one of these systems, or if you want to build a | ||
282 | generic distribution kernel, say Y here - otherwise say N. | ||
283 | |||
284 | config X86_VISWS | ||
285 | bool "SGI 320/540 (Visual Workstation)" | ||
286 | depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT | ||
287 | depends on X86_NON_STANDARD | ||
291 | help | 288 | help |
292 | Choose this option if your computer is a standard PC or compatible. | 289 | The SGI Visual Workstation series is an IA32-based workstation |
290 | based on SGI systems chips with some legacy PC hardware attached. | ||
291 | |||
292 | Say Y here to create a kernel to run on the SGI 320 or 540. | ||
293 | |||
294 | A kernel compiled for the Visual Workstation will run on general | ||
295 | PCs as well. See <file:Documentation/sgi-visws.txt> for details. | ||
296 | |||
297 | config X86_RDC321X | ||
298 | bool "RDC R-321x SoC" | ||
299 | depends on X86_32 | ||
300 | depends on X86_NON_STANDARD | ||
301 | select M486 | ||
302 | select X86_REBOOTFIXUPS | ||
303 | help | ||
304 | This option is needed for RDC R-321x system-on-chip, also known | ||
305 | as R-8610-(G). | ||
306 | If you don't have one of these chips, you should say N here. | ||
307 | |||
308 | config X86_UV | ||
309 | bool "SGI Ultraviolet" | ||
310 | depends on X86_64 | ||
311 | depends on X86_NON_STANDARD | ||
312 | help | ||
313 | This option is needed in order to support SGI Ultraviolet systems. | ||
314 | If you don't have one of these, you should say N here. | ||
315 | |||
316 | config X86_VSMP | ||
317 | bool "Support for ScaleMP vSMP" | ||
318 | select PARAVIRT | ||
319 | depends on X86_64 && PCI | ||
320 | depends on X86_NON_STANDARD | ||
321 | help | ||
322 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | ||
323 | supposed to run on these EM64T-based machines. Only choose this option | ||
324 | if you have one of these machines. | ||
293 | 325 | ||
294 | config X86_ELAN | 326 | config X86_ELAN |
295 | bool "AMD Elan" | 327 | bool "AMD Elan" |
296 | depends on X86_32 | 328 | depends on X86_32 |
329 | depends on X86_NON_STANDARD | ||
297 | help | 330 | help |
298 | Select this for an AMD Elan processor. | 331 | Select this for an AMD Elan processor. |
299 | 332 | ||
@@ -301,33 +334,21 @@ config X86_ELAN | |||
301 | 334 | ||
302 | If unsure, choose "PC-compatible" instead. | 335 | If unsure, choose "PC-compatible" instead. |
303 | 336 | ||
304 | config X86_VOYAGER | 337 | config X86_32_NON_STANDARD |
305 | bool "Voyager (NCR)" | 338 | bool "Support non-standard 32-bit SMP architectures" |
306 | depends on X86_32 && (SMP || BROKEN) && !PCI | 339 | depends on X86_32 && SMP |
340 | depends on X86_NON_STANDARD | ||
307 | help | 341 | help |
308 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | ||
309 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | ||
310 | |||
311 | *** WARNING *** | ||
312 | |||
313 | If you do not specifically know you have a Voyager based machine, | ||
314 | say N here, otherwise the kernel you build will not be bootable. | ||
315 | |||
316 | config X86_GENERICARCH | ||
317 | bool "Generic architecture" | ||
318 | depends on X86_32 | ||
319 | help | ||
320 | This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default | 342 | This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default |
321 | subarchitectures. It is intended for a generic binary kernel. | 343 | subarchitectures. It is intended for a generic binary kernel. |
322 | if you select them all, kernel will probe it one by one. and will | 344 | if you select them all, kernel will probe it one by one. and will |
323 | fallback to default. | 345 | fallback to default. |
324 | 346 | ||
325 | if X86_GENERICARCH | ||
326 | |||
327 | config X86_NUMAQ | 347 | config X86_NUMAQ |
328 | bool "NUMAQ (IBM/Sequent)" | 348 | bool "NUMAQ (IBM/Sequent)" |
329 | depends on SMP && X86_32 && PCI && X86_MPPARSE | 349 | depends on X86_32_NON_STANDARD |
330 | select NUMA | 350 | select NUMA |
351 | select X86_MPPARSE | ||
331 | help | 352 | help |
332 | This option is used for getting Linux to run on a NUMAQ (IBM/Sequent) | 353 | This option is used for getting Linux to run on a NUMAQ (IBM/Sequent) |
333 | NUMA multiquad box. This changes the way that processors are | 354 | NUMA multiquad box. This changes the way that processors are |
@@ -337,59 +358,30 @@ config X86_NUMAQ | |||
337 | 358 | ||
338 | config X86_SUMMIT | 359 | config X86_SUMMIT |
339 | bool "Summit/EXA (IBM x440)" | 360 | bool "Summit/EXA (IBM x440)" |
340 | depends on X86_32 && SMP | 361 | depends on X86_32_NON_STANDARD |
341 | help | 362 | help |
342 | This option is needed for IBM systems that use the Summit/EXA chipset. | 363 | This option is needed for IBM systems that use the Summit/EXA chipset. |
343 | In particular, it is needed for the x440. | 364 | In particular, it is needed for the x440. |
344 | 365 | ||
345 | config X86_ES7000 | 366 | config X86_ES7000 |
346 | bool "Support for Unisys ES7000 IA32 series" | 367 | bool "Support for Unisys ES7000 IA32 series" |
347 | depends on X86_32 && SMP | 368 | depends on X86_32_NON_STANDARD && X86_BIGSMP |
348 | help | 369 | help |
349 | Support for Unisys ES7000 systems. Say 'Y' here if this kernel is | 370 | Support for Unisys ES7000 systems. Say 'Y' here if this kernel is |
350 | supposed to run on an IA32-based Unisys ES7000 system. | 371 | supposed to run on an IA32-based Unisys ES7000 system. |
351 | 372 | ||
352 | config X86_BIGSMP | 373 | config X86_VOYAGER |
353 | bool "Support for big SMP systems with more than 8 CPUs" | 374 | bool "Voyager (NCR)" |
354 | depends on X86_32 && SMP | 375 | depends on SMP && !PCI && BROKEN |
355 | help | 376 | depends on X86_32_NON_STANDARD |
356 | This option is needed for the systems that have more than 8 CPUs | ||
357 | and if the system is not of any sub-arch type above. | ||
358 | |||
359 | endif | ||
360 | |||
361 | config X86_VSMP | ||
362 | bool "Support for ScaleMP vSMP" | ||
363 | select PARAVIRT | ||
364 | depends on X86_64 && PCI | ||
365 | help | ||
366 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | ||
367 | supposed to run on these EM64T-based machines. Only choose this option | ||
368 | if you have one of these machines. | ||
369 | |||
370 | endchoice | ||
371 | |||
372 | config X86_VISWS | ||
373 | bool "SGI 320/540 (Visual Workstation)" | ||
374 | depends on X86_32 && PCI && !X86_VOYAGER && X86_MPPARSE && PCI_GODIRECT | ||
375 | help | 377 | help |
376 | The SGI Visual Workstation series is an IA32-based workstation | 378 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
377 | based on SGI systems chips with some legacy PC hardware attached. | 379 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
378 | |||
379 | Say Y here to create a kernel to run on the SGI 320 or 540. | ||
380 | 380 | ||
381 | A kernel compiled for the Visual Workstation will run on general | 381 | *** WARNING *** |
382 | PCs as well. See <file:Documentation/sgi-visws.txt> for details. | ||
383 | 382 | ||
384 | config X86_RDC321X | 383 | If you do not specifically know you have a Voyager based machine, |
385 | bool "RDC R-321x SoC" | 384 | say N here, otherwise the kernel you build will not be bootable. |
386 | depends on X86_32 | ||
387 | select M486 | ||
388 | select X86_REBOOTFIXUPS | ||
389 | help | ||
390 | This option is needed for RDC R-321x system-on-chip, also known | ||
391 | as R-8610-(G). | ||
392 | If you don't have one of these chips, you should say N here. | ||
393 | 385 | ||
394 | config SCHED_OMIT_FRAME_POINTER | 386 | config SCHED_OMIT_FRAME_POINTER |
395 | def_bool y | 387 | def_bool y |
@@ -419,7 +411,6 @@ config VMI | |||
419 | bool "VMI Guest support" | 411 | bool "VMI Guest support" |
420 | select PARAVIRT | 412 | select PARAVIRT |
421 | depends on X86_32 | 413 | depends on X86_32 |
422 | depends on !X86_VOYAGER | ||
423 | help | 414 | help |
424 | VMI provides a paravirtualized interface to the VMware ESX server | 415 | VMI provides a paravirtualized interface to the VMware ESX server |
425 | (it could be used by other hypervisors in theory too, but is not | 416 | (it could be used by other hypervisors in theory too, but is not |
@@ -430,7 +421,6 @@ config KVM_CLOCK | |||
430 | bool "KVM paravirtualized clock" | 421 | bool "KVM paravirtualized clock" |
431 | select PARAVIRT | 422 | select PARAVIRT |
432 | select PARAVIRT_CLOCK | 423 | select PARAVIRT_CLOCK |
433 | depends on !X86_VOYAGER | ||
434 | help | 424 | help |
435 | Turning on this option will allow you to run a paravirtualized clock | 425 | Turning on this option will allow you to run a paravirtualized clock |
436 | when running over the KVM hypervisor. Instead of relying on a PIT | 426 | when running over the KVM hypervisor. Instead of relying on a PIT |
@@ -441,7 +431,6 @@ config KVM_CLOCK | |||
441 | config KVM_GUEST | 431 | config KVM_GUEST |
442 | bool "KVM Guest support" | 432 | bool "KVM Guest support" |
443 | select PARAVIRT | 433 | select PARAVIRT |
444 | depends on !X86_VOYAGER | ||
445 | help | 434 | help |
446 | This option enables various optimizations for running under the KVM | 435 | This option enables various optimizations for running under the KVM |
447 | hypervisor. | 436 | hypervisor. |
@@ -450,7 +439,6 @@ source "arch/x86/lguest/Kconfig" | |||
450 | 439 | ||
451 | config PARAVIRT | 440 | config PARAVIRT |
452 | bool "Enable paravirtualization code" | 441 | bool "Enable paravirtualization code" |
453 | depends on !X86_VOYAGER | ||
454 | help | 442 | help |
455 | This changes the kernel so it can modify itself when it is run | 443 | This changes the kernel so it can modify itself when it is run |
456 | under a hypervisor, potentially improving performance significantly | 444 | under a hypervisor, potentially improving performance significantly |
@@ -483,11 +471,11 @@ config MEMTEST | |||
483 | 471 | ||
484 | config X86_SUMMIT_NUMA | 472 | config X86_SUMMIT_NUMA |
485 | def_bool y | 473 | def_bool y |
486 | depends on X86_32 && NUMA && X86_GENERICARCH | 474 | depends on X86_32 && NUMA && X86_32_NON_STANDARD |
487 | 475 | ||
488 | config X86_CYCLONE_TIMER | 476 | config X86_CYCLONE_TIMER |
489 | def_bool y | 477 | def_bool y |
490 | depends on X86_GENERICARCH | 478 | depends on X86_32_NON_STANDARD |
491 | 479 | ||
492 | source "arch/x86/Kconfig.cpu" | 480 | source "arch/x86/Kconfig.cpu" |
493 | 481 | ||
@@ -659,7 +647,7 @@ source "kernel/Kconfig.preempt" | |||
659 | 647 | ||
660 | config X86_UP_APIC | 648 | config X86_UP_APIC |
661 | bool "Local APIC support on uniprocessors" | 649 | bool "Local APIC support on uniprocessors" |
662 | depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH) | 650 | depends on X86_32 && !SMP && !X86_32_NON_STANDARD |
663 | help | 651 | help |
664 | A local APIC (Advanced Programmable Interrupt Controller) is an | 652 | A local APIC (Advanced Programmable Interrupt Controller) is an |
665 | integrated interrupt controller in the CPU. If you have a single-CPU | 653 | integrated interrupt controller in the CPU. If you have a single-CPU |
@@ -684,11 +672,11 @@ config X86_UP_IOAPIC | |||
684 | 672 | ||
685 | config X86_LOCAL_APIC | 673 | config X86_LOCAL_APIC |
686 | def_bool y | 674 | def_bool y |
687 | depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) | 675 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC |
688 | 676 | ||
689 | config X86_IO_APIC | 677 | config X86_IO_APIC |
690 | def_bool y | 678 | def_bool y |
691 | depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) | 679 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC |
692 | 680 | ||
693 | config X86_VISWS_APIC | 681 | config X86_VISWS_APIC |
694 | def_bool y | 682 | def_bool y |
@@ -720,7 +708,6 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS | |||
720 | 708 | ||
721 | config X86_MCE | 709 | config X86_MCE |
722 | bool "Machine Check Exception" | 710 | bool "Machine Check Exception" |
723 | depends on !X86_VOYAGER | ||
724 | ---help--- | 711 | ---help--- |
725 | Machine Check Exception support allows the processor to notify the | 712 | Machine Check Exception support allows the processor to notify the |
726 | kernel if it detects a problem (e.g. overheating, component failure). | 713 | kernel if it detects a problem (e.g. overheating, component failure). |
@@ -1028,7 +1015,6 @@ config NUMA | |||
1028 | bool "Numa Memory Allocation and Scheduler Support" | 1015 | bool "Numa Memory Allocation and Scheduler Support" |
1029 | depends on SMP | 1016 | depends on SMP |
1030 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) | 1017 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) |
1031 | default n if X86_PC | ||
1032 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) | 1018 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) |
1033 | help | 1019 | help |
1034 | Enable NUMA (Non Uniform Memory Access) support. | 1020 | Enable NUMA (Non Uniform Memory Access) support. |
@@ -1131,7 +1117,7 @@ config ARCH_SPARSEMEM_DEFAULT | |||
1131 | 1117 | ||
1132 | config ARCH_SPARSEMEM_ENABLE | 1118 | config ARCH_SPARSEMEM_ENABLE |
1133 | def_bool y | 1119 | def_bool y |
1134 | depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_GENERICARCH | 1120 | depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD |
1135 | select SPARSEMEM_STATIC if X86_32 | 1121 | select SPARSEMEM_STATIC if X86_32 |
1136 | select SPARSEMEM_VMEMMAP_ENABLE if X86_64 | 1122 | select SPARSEMEM_VMEMMAP_ENABLE if X86_64 |
1137 | 1123 | ||
@@ -1340,13 +1326,17 @@ config SECCOMP | |||
1340 | 1326 | ||
1341 | If unsure, say Y. Only embedded should say N here. | 1327 | If unsure, say Y. Only embedded should say N here. |
1342 | 1328 | ||
1329 | config CC_STACKPROTECTOR_ALL | ||
1330 | bool | ||
1331 | |||
1343 | config CC_STACKPROTECTOR | 1332 | config CC_STACKPROTECTOR |
1344 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1333 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
1345 | depends on X86_64 && EXPERIMENTAL && BROKEN | 1334 | depends on X86_64 |
1335 | select CC_STACKPROTECTOR_ALL | ||
1346 | help | 1336 | help |
1347 | This option turns on the -fstack-protector GCC feature. This | 1337 | This option turns on the -fstack-protector GCC feature. This |
1348 | feature puts, at the beginning of critical functions, a canary | 1338 | feature puts, at the beginning of functions, a canary value on |
1349 | value on the stack just before the return address, and validates | 1339 | the stack just before the return address, and validates |
1350 | the value just before actually returning. Stack based buffer | 1340 | the value just before actually returning. Stack based buffer |
1351 | overflows (that need to overwrite this return address) now also | 1341 | overflows (that need to overwrite this return address) now also |
1352 | overwrite the canary, which gets detected and the attack is then | 1342 | overwrite the canary, which gets detected and the attack is then |
@@ -1354,21 +1344,13 @@ config CC_STACKPROTECTOR | |||
1354 | 1344 | ||
1355 | This feature requires gcc version 4.2 or above, or a distribution | 1345 | This feature requires gcc version 4.2 or above, or a distribution |
1356 | gcc with the feature backported. Older versions are automatically | 1346 | gcc with the feature backported. Older versions are automatically |
1357 | detected and for those versions, this configuration option is ignored. | 1347 | detected and for those versions, this configuration option is |
1358 | 1348 | ignored. (and a warning is printed during bootup) | |
1359 | config CC_STACKPROTECTOR_ALL | ||
1360 | bool "Use stack-protector for all functions" | ||
1361 | depends on CC_STACKPROTECTOR | ||
1362 | help | ||
1363 | Normally, GCC only inserts the canary value protection for | ||
1364 | functions that use large-ish on-stack buffers. By enabling | ||
1365 | this option, GCC will be asked to do this for ALL functions. | ||
1366 | 1349 | ||
1367 | source kernel/Kconfig.hz | 1350 | source kernel/Kconfig.hz |
1368 | 1351 | ||
1369 | config KEXEC | 1352 | config KEXEC |
1370 | bool "kexec system call" | 1353 | bool "kexec system call" |
1371 | depends on X86_BIOS_REBOOT | ||
1372 | help | 1354 | help |
1373 | kexec is a system call that implements the ability to shutdown your | 1355 | kexec is a system call that implements the ability to shutdown your |
1374 | current kernel, and to start another kernel. It is like a reboot | 1356 | current kernel, and to start another kernel. It is like a reboot |
@@ -1492,7 +1474,7 @@ config PHYSICAL_ALIGN | |||
1492 | 1474 | ||
1493 | config HOTPLUG_CPU | 1475 | config HOTPLUG_CPU |
1494 | bool "Support for hot-pluggable CPUs" | 1476 | bool "Support for hot-pluggable CPUs" |
1495 | depends on SMP && HOTPLUG && !X86_VOYAGER | 1477 | depends on SMP && HOTPLUG |
1496 | ---help--- | 1478 | ---help--- |
1497 | Say Y here to allow turning CPUs off and on. CPUs can be | 1479 | Say Y here to allow turning CPUs off and on. CPUs can be |
1498 | controlled through /sys/devices/system/cpu. | 1480 | controlled through /sys/devices/system/cpu. |
@@ -1573,7 +1555,6 @@ config HAVE_ARCH_EARLY_PFN_TO_NID | |||
1573 | depends on NUMA | 1555 | depends on NUMA |
1574 | 1556 | ||
1575 | menu "Power management and ACPI options" | 1557 | menu "Power management and ACPI options" |
1576 | depends on !X86_VOYAGER | ||
1577 | 1558 | ||
1578 | config ARCH_HIBERNATION_HEADER | 1559 | config ARCH_HIBERNATION_HEADER |
1579 | def_bool y | 1560 | def_bool y |
@@ -1853,7 +1834,6 @@ if X86_32 | |||
1853 | 1834 | ||
1854 | config ISA | 1835 | config ISA |
1855 | bool "ISA support" | 1836 | bool "ISA support" |
1856 | depends on !X86_VOYAGER | ||
1857 | help | 1837 | help |
1858 | Find out whether you have ISA slots on your motherboard. ISA is the | 1838 | Find out whether you have ISA slots on your motherboard. ISA is the |
1859 | name of a bus system, i.e. the way the CPU talks to the other stuff | 1839 | name of a bus system, i.e. the way the CPU talks to the other stuff |
@@ -1880,8 +1860,7 @@ config EISA | |||
1880 | source "drivers/eisa/Kconfig" | 1860 | source "drivers/eisa/Kconfig" |
1881 | 1861 | ||
1882 | config MCA | 1862 | config MCA |
1883 | bool "MCA support" if !X86_VOYAGER | 1863 | bool "MCA support" |
1884 | default y if X86_VOYAGER | ||
1885 | help | 1864 | help |
1886 | MicroChannel Architecture is found in some IBM PS/2 machines and | 1865 | MicroChannel Architecture is found in some IBM PS/2 machines and |
1887 | laptops. It is a bus system similar to PCI or ISA. See | 1866 | laptops. It is a bus system similar to PCI or ISA. See |
@@ -1892,7 +1871,6 @@ source "drivers/mca/Kconfig" | |||
1892 | 1871 | ||
1893 | config SCx200 | 1872 | config SCx200 |
1894 | tristate "NatSemi SCx200 support" | 1873 | tristate "NatSemi SCx200 support" |
1895 | depends on !X86_VOYAGER | ||
1896 | help | 1874 | help |
1897 | This provides basic support for National Semiconductor's | 1875 | This provides basic support for National Semiconductor's |
1898 | (now AMD's) Geode processors. The driver probes for the | 1876 | (now AMD's) Geode processors. The driver probes for the |