summaryrefslogtreecommitdiff
path: root/lib/Kconfig.debug
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 13:58:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 13:58:11 -0700
commit4c619407b0439c59c20398b9459020c0d297f424 (patch)
tree17d5401aebd5fe00a4878353353e29fc8c569b89 /lib/Kconfig.debug
parent26b55633a891a28bf04f42882de145eb8e9cb9ad (diff)
parent145b64b9588c123d2bd00981c5ce8e03215ed2ee (diff)
downloadlinux-3.10-4c619407b0439c59c20398b9459020c0d297f424.tar.gz
linux-3.10-4c619407b0439c59c20398b9459020c0d297f424.tar.bz2
linux-3.10-4c619407b0439c59c20398b9459020c0d297f424.zip
Merge branch 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm
* 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm: kmemleak: Fix typo in the comment lib/scatterlist: Hook sg_kmalloc into kmemleak (v2) kmemleak: Add DocBook style comments to kmemleak.c kmemleak: Introduce a default off mode for kmemleak kmemleak: Show more information for objects found by alias
Diffstat (limited to 'lib/Kconfig.debug')
-rw-r--r--lib/Kconfig.debug7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 79e0dff1cdc..9e06b7f5ecf 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -410,6 +410,13 @@ config DEBUG_KMEMLEAK_TEST
If unsure, say N.
+config DEBUG_KMEMLEAK_DEFAULT_OFF
+ bool "Default kmemleak to off"
+ depends on DEBUG_KMEMLEAK
+ help
+ Say Y here to disable kmemleak by default. It can then be enabled
+ on the command line via kmemleak=on.
+
config DEBUG_PREEMPT
bool "Debug preemptible kernel"
depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT