From 48c64a3bf757db8726ad26d47d16631993cca995 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 14 Jul 2011 15:19:09 +0200
Subject: [PATCH] --- yaml --- r: 262423 b: refs/heads/master c:
 f59de8992aa6dc85e81aadc26b0f69e17809721d h: refs/heads/master i:   262421:
 38252cc0a1399d7b747acc283ad555b0d6167ba3   262419:
 c2cba13190a58f82ece344f8b3bbaca4334a7b3d   262415:
 6d3f84644c65a1921ea20fac20ea3b004dd8f5e0 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/lockdep.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 81c8c54e0f08..1fbf5ea695f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83835b3d9aec8e9f666d8223d8a386814f756266
+refs/heads/master: f59de8992aa6dc85e81aadc26b0f69e17809721d
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 5903586f32a0..8c24294e477f 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -2874,10 +2874,7 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
 void lockdep_init_map(struct lockdep_map *lock, const char *name,
 		      struct lock_class_key *key, int subclass)
 {
-	int i;
-
-	for (i = 0; i < NR_LOCKDEP_CACHING_CLASSES; i++)
-		lock->class_cache[i] = NULL;
+	memset(lock, 0, sizeof(*lock));
 
 #ifdef CONFIG_LOCK_STAT
 	lock->cpu = raw_smp_processor_id();