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 | |
| parent | 53ba4f2fa73225113a488584df0d85d3cba52943 (diff) | |
| parent | 913769f24eadcd38a936ffae41d9b4895ec02e43 (diff) | |
| download | kernel_samsung_tuna-0e417fe1f247bb3ac056ee04604332005c334fac.zip kernel_samsung_tuna-0e417fe1f247bb3ac056ee04604332005c334fac.tar.gz kernel_samsung_tuna-0e417fe1f247bb3ac056ee04604332005c334fac.tar.bz2 | |
Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into core/locking
| -rw-r--r-- | kernel/lockdep.c | 7 | ||||
| -rw-r--r-- | kernel/lockdep_internals.h | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 78325f8..1b58a1b 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: */ diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h index 8d7d4b6..2b17476 100644 --- a/kernel/lockdep_internals.h +++ b/kernel/lockdep_internals.h @@ -140,19 +140,13 @@ struct lockdep_stats { DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats); #define debug_atomic_inc(ptr) { \ - struct lockdep_stats *__cpu_lockdep_stats; \ - \ WARN_ON_ONCE(!irqs_disabled()); \ - __cpu_lockdep_stats = &__get_cpu_var(lockdep_stats); \ - __cpu_lockdep_stats->ptr++; \ + this_cpu_inc(lockdep_stats.ptr); \ } #define debug_atomic_dec(ptr) { \ - struct lockdep_stats *__cpu_lockdep_stats; \ - \ WARN_ON_ONCE(!irqs_disabled()); \ - __cpu_lockdep_stats = &__get_cpu_var(lockdep_stats); \ - __cpu_lockdep_stats->ptr--; \ + this_cpu_inc(lockdep_stats.ptr); \ } #define debug_atomic_read(ptr) ({ \ |