git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netlink: bug fix: don't overrun skbs on vf_port dump
[safe/jmp/linux-2.6]
/
lib
/
locking-selftest.c
diff --git
a/lib/locking-selftest.c
b/lib/locking-selftest.c
index
280332c
..
619313e
100644
(file)
--- 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(); \
#define SOFTIRQ_ENTER() \
local_bh_disable(); \
local_irq_disable(); \
-
trace_softirq_enter();
\
+
lockdep_softirq_enter();
\
WARN_ON(!in_softirq());
#define SOFTIRQ_EXIT() \
WARN_ON(!in_softirq());
#define SOFTIRQ_EXIT() \
-
trace_softirq_exit();
\
+
lockdep_softirq_exit();
\
local_irq_enable(); \
local_bh_enable();
local_irq_enable(); \
local_bh_enable();