aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 19:44:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 19:44:13 -0400
commit83d7e948754cf021ed7343b122940fcc27c1bd88 (patch)
treef04ba1ecb4fa337fc2bbd49b44df07775e4636ff /lib
parentfce4a1dda2f1a9a25b3e5b7cd951070e0b42a818 (diff)
parent9b090f2da85bd0df5e1a1ecfe4120b7b50358f48 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm: kmemleak: Initialise kmemleak after debug_objects_mem_init() kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAK kmemleak: Do not return a pointer to an object that kmemleak did not get
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f0aa00ba3fac..17ac5f87182d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -400,7 +400,7 @@ config DEBUG_KMEMLEAK
400 depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \ 400 depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
401 (X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE) 401 (X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
402 402
403 select DEBUG_FS if SYSFS 403 select DEBUG_FS
404 select STACKTRACE if STACKTRACE_SUPPORT 404 select STACKTRACE if STACKTRACE_SUPPORT
405 select KALLSYMS 405 select KALLSYMS
406 select CRC32 406 select CRC32