aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3d0f2b6a5a16..68d91c8233f4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -22,7 +22,6 @@ config X86
22 select HAVE_IDE 22 select HAVE_IDE
23 select HAVE_OPROFILE 23 select HAVE_OPROFILE
24 select HAVE_IOREMAP_PROT 24 select HAVE_IOREMAP_PROT
25 select HAVE_GET_USER_PAGES_FAST
26 select HAVE_KPROBES 25 select HAVE_KPROBES
27 select ARCH_WANT_OPTIONAL_GPIOLIB 26 select ARCH_WANT_OPTIONAL_GPIOLIB
28 select HAVE_KRETPROBES 27 select HAVE_KRETPROBES
@@ -952,9 +951,9 @@ config NUMA
952 local memory controller of the CPU and add some more 951 local memory controller of the CPU and add some more
953 NUMA awareness to the kernel. 952 NUMA awareness to the kernel.
954 953
955 For i386 this is currently highly experimental and should be only 954 For 32-bit this is currently highly experimental and should be only
956 used for kernel development. It might also cause boot failures. 955 used for kernel development. It might also cause boot failures.
957 For x86_64 this is recommended on all multiprocessor Opteron systems. 956 For 64-bit this is recommended on all multiprocessor Opteron systems.
958 If the system is EM64T, you should say N unless your system is 957 If the system is EM64T, you should say N unless your system is
959 EM64T NUMA. 958 EM64T NUMA.
960 959
@@ -1264,7 +1263,7 @@ config KEXEC
1264 strongly in flux, so no good recommendation can be made. 1263 strongly in flux, so no good recommendation can be made.
1265 1264
1266config CRASH_DUMP 1265config CRASH_DUMP
1267 bool "kernel crash dumps (EXPERIMENTAL)" 1266 bool "kernel crash dumps"
1268 depends on X86_64 || (X86_32 && HIGHMEM) 1267 depends on X86_64 || (X86_32 && HIGHMEM)
1269 help 1268 help
1270 Generate crash dump after being started by kexec. 1269 Generate crash dump after being started by kexec.