---

yaml --- r: 190985 b: refs/heads/master c: 8795d77 h: refs/heads/master i: 190983: 2724387 v: v3
git-mirror · Apr 30, 2010 · 6c1885a · 6c1885a
1 parent 11b322d
commit 6c1885a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 868c522b1b75fd3fd3e6a636b4c344ac08edf13a
+refs/heads/master: 8795d7717c467bea7b0a0649d44a258e09f34db2
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
@@ -2298,7 +2298,12 @@ void trace_hardirqs_on_caller(unsigned long ip)
 		return;
 
 	if (unlikely(curr->hardirqs_enabled)) {
-		debug_atomic_inc(redundant_hardirqs_on);
+		/*
+		 * Neither irq nor preemption are disabled here
+		 * so this is racy by nature but loosing one hit
+		 * in a stat is not a big deal.
+		 */
+		this_cpu_inc(lockdep_stats.redundant_hardirqs_on);
 		return;
 	}
 	/* we'll do an OFF -> ON transition: */