aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig47
1 files changed, 31 insertions, 16 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8955262caa34..469f3450bf81 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -40,6 +40,9 @@ config X86
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
42 select USER_STACKTRACE_SUPPORT 42 select USER_STACKTRACE_SUPPORT
43 select HAVE_KERNEL_GZIP
44 select HAVE_KERNEL_BZIP2
45 select HAVE_KERNEL_LZMA
43 46
44config ARCH_DEFCONFIG 47config ARCH_DEFCONFIG
45 string 48 string
@@ -285,6 +288,7 @@ config X86_BIGSMP
285 ---help--- 288 ---help---
286 This option is needed for the systems that have more than 8 CPUs 289 This option is needed for the systems that have more than 8 CPUs
287 290
291if X86_32
288config X86_EXTENDED_PLATFORM 292config X86_EXTENDED_PLATFORM
289 bool "Support for extended (non-PC) x86 platforms" 293 bool "Support for extended (non-PC) x86 platforms"
290 default y 294 default y
@@ -293,12 +297,36 @@ config X86_EXTENDED_PLATFORM
293 standard PC platforms. (which covers the vast majority of 297 standard PC platforms. (which covers the vast majority of
294 systems out there.) 298 systems out there.)
295 299
296 If you enable this option then you'll be able to select a number 300 If you enable this option then you'll be able to select support
297 of non-PC x86 platforms. 301 for the following (non-PC) 32 bit x86 platforms:
302 AMD Elan
303 NUMAQ (IBM/Sequent)
304 RDC R-321x SoC
305 SGI 320/540 (Visual Workstation)
306 Summit/EXA (IBM x440)
307 Unisys ES7000 IA32 series
298 308
299 If you have one of these systems, or if you want to build a 309 If you have one of these systems, or if you want to build a
300 generic distribution kernel, say Y here - otherwise say N. 310 generic distribution kernel, say Y here - otherwise say N.
311endif
312
313if X86_64
314config X86_EXTENDED_PLATFORM
315 bool "Support for extended (non-PC) x86 platforms"
316 default y
317 ---help---
318 If you disable this option then the kernel will only support
319 standard PC platforms. (which covers the vast majority of
320 systems out there.)
301 321
322 If you enable this option then you'll be able to select support
323 for the following (non-PC) 64 bit x86 platforms:
324 ScaleMP vSMP
325 SGI Ultraviolet
326
327 If you have one of these systems, or if you want to build a
328 generic distribution kernel, say Y here - otherwise say N.
329endif
302# This is an alphabetically sorted list of 64 bit extended platforms 330# This is an alphabetically sorted list of 64 bit extended platforms
303# Please maintain the alphabetic order if and when there are additions 331# Please maintain the alphabetic order if and when there are additions
304 332
@@ -397,19 +425,6 @@ config X86_ES7000
397 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is 425 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
398 supposed to run on an IA32-based Unisys ES7000 system. 426 supposed to run on an IA32-based Unisys ES7000 system.
399 427
400config X86_VOYAGER
401 bool "Voyager (NCR)"
402 depends on SMP && !PCI && BROKEN
403 depends on X86_32_NON_STANDARD
404 ---help---
405 Voyager is an MCA-based 32-way capable SMP architecture proprietary
406 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
407
408 *** WARNING ***
409
410 If you do not specifically know you have a Voyager based machine,
411 say N here, otherwise the kernel you build will not be bootable.
412
413config SCHED_OMIT_FRAME_POINTER 428config SCHED_OMIT_FRAME_POINTER
414 def_bool y 429 def_bool y
415 prompt "Single-depth WCHAN output" 430 prompt "Single-depth WCHAN output"
@@ -1810,7 +1825,7 @@ config DMAR
1810 remapping devices. 1825 remapping devices.
1811 1826
1812config DMAR_DEFAULT_ON 1827config DMAR_DEFAULT_ON
1813 def_bool n 1828 def_bool y
1814 prompt "Enable DMA Remapping Devices by default" 1829 prompt "Enable DMA Remapping Devices by default"
1815 depends on DMAR 1830 depends on DMAR
1816 help 1831 help