diff --git a/[refs] b/[refs] index 43587d8921d7..1467709770ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a140feab42d1cfd811930ab76104559c19dfc4b0 +refs/heads/master: 03d78913f01e8f6599823f00357ed17b32747d3d diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 02014f7ccc86..9a1e2bcc4b8d 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -433,13 +433,6 @@ atomic_t nr_find_usage_forwards_checks; atomic_t nr_find_usage_forwards_recursions; atomic_t nr_find_usage_backwards_checks; atomic_t nr_find_usage_backwards_recursions; -# define debug_atomic_inc(ptr) atomic_inc(ptr) -# define debug_atomic_dec(ptr) atomic_dec(ptr) -# define debug_atomic_read(ptr) atomic_read(ptr) -#else -# define debug_atomic_inc(ptr) do { } while (0) -# define debug_atomic_dec(ptr) do { } while (0) -# define debug_atomic_read(ptr) 0 #endif /*