From 6c1885a3584517ee68e158c8a8d9e09c29584681 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 15 Apr 2010 23:10:42 +0200
Subject: [PATCH] --- yaml --- r: 190985 b: refs/heads/master c:
 8795d7717c467bea7b0a0649d44a258e09f34db2 h: refs/heads/master i:   190983:
 2724387c8887c21af4f4c1f3b2c3f15c321942ad v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/lockdep.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 84653176b3c6..08db14594764 100644
--- 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
index 78325f8f1139..1b58a1bbcc87 100644
--- 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: */