aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b0a638b4199..1a315057078 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -933,6 +933,12 @@ config X86_CPUID
933 with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to 933 with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
934 /dev/cpu/31/cpuid. 934 /dev/cpu/31/cpuid.
935 935
936config X86_CPU_DEBUG
937 tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support"
938 ---help---
939 If you select this option, this will provide various x86 CPUs
940 information through debugfs.
941
936choice 942choice
937 prompt "High Memory Support" 943 prompt "High Memory Support"
938 default HIGHMEM4G if !X86_NUMAQ 944 default HIGHMEM4G if !X86_NUMAQ
@@ -1433,7 +1439,7 @@ config CRASH_DUMP
1433config KEXEC_JUMP 1439config KEXEC_JUMP
1434 bool "kexec jump (EXPERIMENTAL)" 1440 bool "kexec jump (EXPERIMENTAL)"
1435 depends on EXPERIMENTAL 1441 depends on EXPERIMENTAL
1436 depends on KEXEC && HIBERNATION && X86_32 1442 depends on KEXEC && HIBERNATION
1437 ---help--- 1443 ---help---
1438 Jump between original kernel and kexeced kernel and invoke 1444 Jump between original kernel and kexeced kernel and invoke
1439 code in physical address mode via KEXEC 1445 code in physical address mode via KEXEC