summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-07-14 15:19:09 +0200
committerIngo Molnar <mingo@elte.hu>2011-08-04 10:17:56 +0200
commitf59de8992aa6dc85e81aadc26b0f69e17809721d (patch)
tree4cdb87598edb67a774281bf3cea2800114d2fa0c
parent83835b3d9aec8e9f666d8223d8a386814f756266 (diff)
downloadop-kernel-dev-f59de8992aa6dc85e81aadc26b0f69e17809721d.zip
op-kernel-dev-f59de8992aa6dc85e81aadc26b0f69e17809721d.tar.gz
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@kernel.org> Reported-and-tested-by: Christian Casteyde <casteyde.christian@free.fr> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=35532 Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20110714131909.GJ3455@htj.dyndns.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/lockdep.c5
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();
OpenPOWER on IntegriCloud