Author: Pekka Enberg <penberg@xxxxxxxxxxxxxx> AuthorDate: Thu, 26 Feb 2009 09:17:23 +0200 Commit: Vegard Nossum <vegard.nossum@xxxxxxxxx> CommitDate: Thu, 26 Feb 2009 09:10:10 +0100 kmemcheck: Disable SLUB and SLAB debugging when kmemcheck is enabled Enabling kmemcheck in Kconfig is a painful experience. Lets make it a tad bit easier by inverting the dependencies to SLUB and SLAB debugging. As kmemcheck is more powerful than slab debugging, disable the latter functionality if an user enables kmemcheck. Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx> --- arch/x86/Kconfig.debug | 2 +- lib/Kconfig.debug | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index de186c5..3d1d593 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 && !SLUB_DEBUG_ON) || (SLAB && !DEBUG_SLAB) + depends on SLUB || SLAB depends on !CC_OPTIMIZE_FOR_SIZE depends on !DEBUG_PAGEALLOC depends on !FUNCTION_TRACER diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 29044f5..e9a930c 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -262,7 +262,7 @@ config DEBUG_OBJECTS_ENABLE_DEFAULT config DEBUG_SLAB bool "Debug slab memory allocations" - depends on DEBUG_KERNEL && SLAB + depends on DEBUG_KERNEL && SLAB && !KMEMCHECK help Say Y here to have the kernel do limited verification on memory allocation as well as poisoning memory on free to catch use of freed @@ -274,7 +274,7 @@ config DEBUG_SLAB_LEAK config SLUB_DEBUG_ON bool "SLUB debugging on by default" - depends on SLUB && SLUB_DEBUG + depends on SLUB && SLUB_DEBUG && !KMEMCHECK default n help Boot with debugging on by default. SLUB boots by default with -- 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
|