From f309778ade767983f3c4d2bccdf08506a866e673 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Thu, 15 Apr 2010 23:10:43 +0200 Subject: [PATCH] --- yaml --- r: 190986 b: refs/heads/master c: 913769f24eadcd38a936ffae41d9b4895ec02e43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/lockdep_internals.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 08db14594764..721118265291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8795d7717c467bea7b0a0649d44a258e09f34db2 +refs/heads/master: 913769f24eadcd38a936ffae41d9b4895ec02e43 diff --git a/trunk/kernel/lockdep_internals.h b/trunk/kernel/lockdep_internals.h index 8d7d4b6c741a..2b174762fa0e 100644 --- a/trunk/kernel/lockdep_internals.h +++ b/trunk/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) ({ \