Author: Vegard Nossum <vegard.nossum@xxxxxxxxx> AuthorDate: Sun, 22 Feb 2009 12:03:44 +0100 Commit: Vegard Nossum <vegard.nossum@xxxxxxxxx> CommitDate: Sun, 22 Feb 2009 12:36:13 +0100 kmemcheck: depend on !SLUB_DEBUG_ON This patch fixes the problem of SLUB debugging taking precedence over kmemcheck at boot (if SLUB_DEBUG_ON=y and no slub_debug=- is provided on the command line), while still retaining the possibility of using SLUB debugging (instead of kmemcheck tracking) if slub_debug= is provided explicitly on the command line. Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx> --- 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 f3fccb2..1067ad7 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -276,7 +276,7 @@ menuconfig KMEMCHECK bool "kmemcheck: trap use of uninitialized memory" depends on X86 depends on !X86_USE_3DNOW - depends on SLUB || (SLAB && !DEBUG_SLAB) + depends on (SLUB && !SLUB_DEBUG_ON) || (SLAB && !DEBUG_SLAB) depends on !CC_OPTIMIZE_FOR_SIZE depends on !DEBUG_PAGEALLOC select FRAME_POINTER -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|