---

yaml --- r: 31823 b: refs/heads/master c: 5436552 h: refs/heads/master i: 31821: b931a15 31819: 7cec5ad 31815: e89b6d5 31807: 751c8fe v: v3
git-mirror · Jul 3, 2006 · b86668e · b86668e
1 parent 7331d4b
commit b86668e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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