diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /kernel/lockdep.c | |
parent | aecfcde920da8d32949f6cbbc1fc051b4ef9e7be (diff) | |
parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) |
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; | |||
434 | atomic_t nr_find_usage_forwards_recursions; | 434 | atomic_t nr_find_usage_forwards_recursions; |
435 | atomic_t nr_find_usage_backwards_checks; | 435 | atomic_t nr_find_usage_backwards_checks; |
436 | atomic_t nr_find_usage_backwards_recursions; | 436 | atomic_t nr_find_usage_backwards_recursions; |
437 | # define debug_atomic_inc(ptr) atomic_inc(ptr) | ||
438 | # define debug_atomic_dec(ptr) atomic_dec(ptr) | ||
439 | # define debug_atomic_read(ptr) atomic_read(ptr) | ||
440 | #else | ||
441 | # define debug_atomic_inc(ptr) do { } while (0) | ||
442 | # define debug_atomic_dec(ptr) do { } while (0) | ||
443 | # define debug_atomic_read(ptr) 0 | ||
444 | #endif | 437 | #endif |
445 | 438 | ||
446 | /* | 439 | /* |