From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 3 Jul 2006 07:25:11 +0000 (-0700)
Subject: [PATCH] lockdep: annotate hrtimer base locks
X-Git-Tag: v2.6.18-rc1~59
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=543655244866b8ec648fea1eb9c32a35ffba5721;p=linux-2.6

[PATCH] lockdep: annotate hrtimer base locks

Teach special (recursive) locking code to the lock validator.  Has no effect
on non-lockdep kernels.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 07d7305f13..e4bccbcc27 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -91,6 +91,7 @@ struct hrtimer_base {
 	ktime_t			(*get_softirq_time)(void);
 	struct hrtimer		*curr_timer;
 	ktime_t			softirq_time;
+	struct lock_class_key lock_key;
 };
 
 /*
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 8d3dc29ef4..617304ce67 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -782,8 +782,10 @@ static void __devinit init_hrtimers_cpu(int cpu)
 	struct hrtimer_base *base = per_cpu(hrtimer_bases, cpu);
 	int i;
 
-	for (i = 0; i < MAX_HRTIMER_BASES; i++, base++)
+	for (i = 0; i < MAX_HRTIMER_BASES; i++, base++) {
 		spin_lock_init(&base->lock);
+		lockdep_set_class(&base->lock, &base->lock_key);
+	}
 }
 
 #ifdef CONFIG_HOTPLUG_CPU