diff --git a/[refs] b/[refs] index 3215ff1be6c3..d87f648263bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5f51c966720fa519c6ce69b169107dbc5769cdf +refs/heads/master: 50dd26ba0947aa653f0e42897aad7a4adce4e620 diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index 80598cfd728c..c48260fb8fd9 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -79,7 +79,7 @@ config SCHEDSTATS config DEBUG_SLAB bool "Debug memory allocations" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && SLAB 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