summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 01:30:40 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 01:32:36 +0100
commitd820ac4c2fa881079e6b689d2098adce337558ae (patch)
tree39e4e989d22271cd401f6974c9ae7accc571d500 /lib
parentMerge branch 'linus' into core/locking (diff)
downloadlinux-d820ac4c2fa881079e6b689d2098adce337558ae.tar.xz
linux-d820ac4c2fa881079e6b689d2098adce337558ae.zip
locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]
Impact: cleanup The naming clashes with upcoming softirq tracepoints, so rename the APIs to lockdep_*(). Requested-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib')
-rw-r--r--lib/locking-selftest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 280332c1827c..619313ed6c46 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -157,11 +157,11 @@ static void init_shared_classes(void)
#define SOFTIRQ_ENTER() \
local_bh_disable(); \
local_irq_disable(); \
- trace_softirq_enter(); \
+ lockdep_softirq_enter(); \
WARN_ON(!in_softirq());
#define SOFTIRQ_EXIT() \
- trace_softirq_exit(); \
+ lockdep_softirq_exit(); \
local_irq_enable(); \
local_bh_enable();