diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-03 09:17:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-03 09:17:46 +0200 |
| commit | 0e417fe1f247bb3ac056ee04604332005c334fac (patch) | |
| tree | b1786f5789aa015f488a834a675c20120791bce3 /kernel/lockdep.c | |
| parent | Merge commit 'v2.6.34-rc6' into core/locking (diff) | |
| parent | lockdep: Simplify debug atomic ops (diff) | |
| download | linux-0e417fe1f247bb3ac056ee04604332005c334fac.tar.xz linux-0e417fe1f247bb3ac056ee04604332005c334fac.zip | |
Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into core/locking
Diffstat (limited to 'kernel/lockdep.c')
| -rw-r--r-- | kernel/lockdep.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 78325f8f1139..1b58a1bbcc87 100644 --- 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: */ |