Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-block.git] / kernel / lockdep_internals.h

diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
index 8d7d4b6c741a242b740903e002f9e3555933512f..4f560cfedc8fd038c4dd09bfb590a9932fbd1193 100644 (file)
--- a/kernel/lockdep_internals.h
+++ b/kernel/lockdep_internals.h
@@ -139,20 +139,17 @@ struct lockdep_stats {
 
 DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats);
 
+#define __debug_atomic_inc(ptr)                                        \
+       this_cpu_inc(lockdep_stats.ptr);
+
 #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_dec(lockdep_stats.ptr);                      \
 }
 
 #define debug_atomic_read(ptr)         ({                              \
@@ -166,6 +163,7 @@ DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats);
        __total;                                                        \
 })
 #else
+# define __debug_atomic_inc(ptr)       do { } while (0)
 # define debug_atomic_inc(ptr)         do { } while (0)
 # define debug_atomic_dec(ptr)         do { } while (0)
 # define debug_atomic_read(ptr)                0