git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
lib
/
locking-selftest.c
diff --git
a/lib/locking-selftest.c
b/lib/locking-selftest.c
index
619313e
..
507a22f
100644
(file)
--- a/
lib/locking-selftest.c
+++ b/
lib/locking-selftest.c
@@
-144,7
+144,7
@@
static void init_shared_classes(void)
#define HARDIRQ_ENTER() \
local_irq_disable(); \
-
irq_enter();
\
+
__irq_enter();
\
WARN_ON(!in_irq());
#define HARDIRQ_EXIT() \