[tip:core/urgent] lockdep: Clear whole lockdep_map on initialization

From: tip-bot for Tejun Heo
Date: Thu Aug 04 2011 - 04:36:14 EST


Commit-ID: f59de8992aa6dc85e81aadc26b0f69e17809721d
Gitweb: http://git.kernel.org/tip/f59de8992aa6dc85e81aadc26b0f69e17809721d
Author: Tejun Heo <tj@xxxxxxxxxx>
AuthorDate: Thu, 14 Jul 2011 15:19:09 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 4 Aug 2011 10:17:56 +0200

lockdep: Clear whole lockdep_map on initialization

lockdep_init_map() only initializes parts of lockdep_map and triggers
kmemcheck warning when it is copied as a whole. There isn't anything
to be gained by clearing selectively. memset() the whole structure
and remove loop for ->class_cache[] clearing.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=35532

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-and-tested-by: Christian Casteyde <casteyde.christian@xxxxxxx>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=35532
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/20110714131909.GJ3455@xxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/lockdep.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 5903586..8c24294 100644
--- a/kernel/lockdep.c
+++ b/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();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/