diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-01-20 10:42:40 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-01-20 16:57:05 +0000 |
| commit | b370d29ea7565a638ccf85389488364b5abb39fa (patch) | |
| tree | fe6a305ff21a1494ab107ec7e6f5bd05a85a712d /mm/kmemleak.c | |
| parent | b469d4329cf949043f9b93a6644f2c64015ef8cd (diff) | |
| download | linux-stable-b370d29ea7565a638ccf85389488364b5abb39fa.tar.gz linux-stable-b370d29ea7565a638ccf85389488364b5abb39fa.tar.bz2 linux-stable-b370d29ea7565a638ccf85389488364b5abb39fa.zip | |
kmemleak: Disable early logging when kmemleak is off by default
Commit b6693005 (kmemleak: When the early log buffer is exceeded, report
the actual number) deferred the disabling of the early logging to
kmemleak_init(). However, when CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y, the
early logging was no longer disabled causing __init kmemleak functions
to be called even after the kernel freed the init memory. This patch
disables the early logging during kmemleak_init() if kmemleak is left
disabled.
Reported-by: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de>
Tested-by: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de>
Tested-by: Josh Boyer <jwboyer@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'mm/kmemleak.c')
| -rw-r--r-- | mm/kmemleak.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index f9f7310f0fdb..45eb6217bf38 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1757,6 +1757,7 @@ void __init kmemleak_init(void) #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF if (!kmemleak_skip_disable) { + atomic_set(&kmemleak_early_log, 0); kmemleak_disable(); return; } |