diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 08:16:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:44:08 +0100 |
| commit | 62395efdb0ef42e664ca81677901268c403a6286 (patch) | |
| tree | 7ce9e6ba8b3fa0c004f852b56966e96ad948d2f8 /arch/x86/Kconfig | |
| parent | ccd50dfd92ea2c4ba9e39531ac55db53393e783e (diff) | |
| parent | 88200bc28da38bcda1cb1bd218216e83b426d8a8 (diff) | |
Merge branch 'x86/asm' into tracing/syscalls
We need the wider TIF work-mask checks in entry_32.S.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 8 |
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 with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to /dev/cpu/31/cpuid. +config X86_CPU_DEBUG + tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support" + ---help--- + If you select this option, this will provide various x86 CPUs + information through debugfs. + choice prompt "High Memory Support" default HIGHMEM4G if !X86_NUMAQ @@ -1433,7 +1439,7 @@ config CRASH_DUMP config KEXEC_JUMP bool "kexec jump (EXPERIMENTAL)" depends on EXPERIMENTAL - depends on KEXEC && HIBERNATION && X86_32 + depends on KEXEC && HIBERNATION ---help--- Jump between original kernel and kexeced kernel and invoke code in physical address mode via KEXEC |