diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 16:58:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 16:58:11 -0400 |
| commit | 4c619407b0439c59c20398b9459020c0d297f424 (patch) | |
| tree | 17d5401aebd5fe00a4878353353e29fc8c569b89 /lib/Kconfig.debug | |
| parent | 26b55633a891a28bf04f42882de145eb8e9cb9ad (diff) | |
| parent | 145b64b9588c123d2bd00981c5ce8e03215ed2ee (diff) | |
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.debug | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 79e0dff1cdcb..9e06b7f5ecf1 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -410,6 +410,13 @@ config DEBUG_KMEMLEAK_TEST | |||
| 410 | 410 | ||
| 411 | If unsure, say N. | 411 | If unsure, say N. |
| 412 | 412 | ||
| 413 | config DEBUG_KMEMLEAK_DEFAULT_OFF | ||
| 414 | bool "Default kmemleak to off" | ||
| 415 | depends on DEBUG_KMEMLEAK | ||
| 416 | help | ||
| 417 | Say Y here to disable kmemleak by default. It can then be enabled | ||
| 418 | on the command line via kmemleak=on. | ||
| 419 | |||
| 413 | config DEBUG_PREEMPT | 420 | config DEBUG_PREEMPT |
| 414 | bool "Debug preemptible kernel" | 421 | bool "Debug preemptible kernel" |
| 415 | depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT | 422 | depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT |