diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:33:21 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:33:21 +0100 |
commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /kernel/lockdep.c | |
parent | Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] (diff) | |
download | linux-480c93df5b99699390f93a7024c9f60d09da0e96.tar.xz linux-480c93df5b99699390f93a7024c9f60d09da0e96.zip |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'kernel/lockdep.c')
-rw-r--r-- | kernel/lockdep.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index cb70c1db85d0..71b567f52813 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -434,13 +434,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 /* |