diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:59:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:59:23 -0400 |
| commit | 2b4fa851b2f06fdb04cac808b57324f5e51e1578 (patch) | |
| tree | 97db3ad5adda7683923630982f68b8b52c86e790 /arch/x86/Kconfig.debug | |
| parent | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (diff) | |
| parent | 46f68e1c6b04a04772e828ff3bcd07ed708805c2 (diff) | |
Merge branch 'x86/numa' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/e820.c
arch/x86/kernel/efi_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/setup_32.c
arch/x86/mm/init_64.c
include/asm-x86/proto.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig.debug')
| -rw-r--r-- | arch/x86/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index f0684bb74faf..acc0271920f2 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
| @@ -68,7 +68,7 @@ config DEBUG_PAGEALLOC | |||
| 68 | config DEBUG_PER_CPU_MAPS | 68 | config DEBUG_PER_CPU_MAPS |
| 69 | bool "Debug access to per_cpu maps" | 69 | bool "Debug access to per_cpu maps" |
| 70 | depends on DEBUG_KERNEL | 70 | depends on DEBUG_KERNEL |
| 71 | depends on X86_64_SMP | 71 | depends on X86_SMP |
| 72 | default n | 72 | default n |
| 73 | help | 73 | help |
| 74 | Say Y to verify that the per_cpu map being accessed has | 74 | Say Y to verify that the per_cpu map being accessed has |