From b86668ece16df4bdc2342c5c93257c97454aa7c4 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 3 Jul 2006 00:25:11 -0700
Subject: [PATCH] --- yaml --- r: 31823 b: refs/heads/master c:
 543655244866b8ec648fea1eb9c32a35ffba5721 h: refs/heads/master i:   31821:
 b931a152bde2e1ac3a548f9e20020555f7607721   31819:
 7cec5ad52cd718fced3f919e7427e35ac3c2322a   31815:
 e89b6d5bae3c74aa4abb3c0a74d2fe6bbb822b41   31807:
 751c8fe3e201192bd7ade00fba0d6d8be5394a8d v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hrtimer.h | 1 +
 trunk/kernel/hrtimer.c        | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff8505051a52..d238d7a1dc47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb993712f231a4faea8393513d1276170679107
+refs/heads/master: 543655244866b8ec648fea1eb9c32a35ffba5721
diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h
index 07d7305f131e..e4bccbcc2750 100644
--- a/trunk/include/linux/hrtimer.h
+++ b/trunk/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/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 8d3dc29ef41a..617304ce67db 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/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