From b45d33f2c72a54712cbbd325fa9583776e2620bb Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 20 Jan 2012 10:42:40 +0000
Subject: [PATCH] --- yaml --- r: 287190 b: refs/heads/master c:
 b370d29ea7565a638ccf85389488364b5abb39fa h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/mm/kmemleak.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 31efb0854b3a..eba78592b34a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b469d4329cf949043f9b93a6644f2c64015ef8cd
+refs/heads/master: b370d29ea7565a638ccf85389488364b5abb39fa
diff --git a/trunk/mm/kmemleak.c b/trunk/mm/kmemleak.c
index f9f7310f0fdb..45eb6217bf38 100644
--- a/trunk/mm/kmemleak.c
+++ b/trunk/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;
 	}