Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[deliverable/linux.git] / kernel / lockdep.c

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 78325f8f1139eb038189e8978944b4d874e667c8..1b58a1bbcc87ec7a2604a12b575aca61dfc2a15e 100644 (file)
--- a/kernel/lockdep.c
+++ b/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: */