summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 17:29:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 17:29:53 -0700
commit492f59f526d95e73028f57bff475b4bbe3c8cb72 (patch)
tree8419a65de08183e350a468433fb3f4205e49ae80 /lib
parentf945b7abcb6cfd3106c9855aa2aa6e4396a19d76 (diff)
parent7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (diff)
downloadlinux-3.10-492f59f526d95e73028f57bff475b4bbe3c8cb72.tar.gz
linux-3.10-492f59f526d95e73028f57bff475b4bbe3c8cb72.tar.bz2
linux-3.10-492f59f526d95e73028f57bff475b4bbe3c8cb72.zip
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions lockdep: require framepointers for x86 lockdep: remove extra "irq" string lockdep: fix incorrect state name
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 280332c1827..619313ed6c4 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();