lockdep: Simplify debug atomic ops

Simplify debug_atomic_inc/dec by using this_cpu_inc/dec() instead
of doing it through an indirect get_cpu_var() and a manual
incrementation.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>

diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
index 8d7d4b6..2b17476 100644 (file)
--- 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)         ({                              \