diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-27 06:38:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-28 11:41:05 -0400 |
| commit | 29f742f88a32c9ab8cf6d9ba69e1ea918be5aa58 (patch) | |
| tree | a38aa38c8025e050ec82a7e64d02dca07f90ffc7 /lib | |
| parent | f62508f68d04adefc4cf9b0177ba02c8818b3eec (diff) | |
| parent | 23b5c8fa01b723c70a20d6e4ef4ff54c7656d6e1 (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/locking-selftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index 619313ed6c46..507a22fab738 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c | |||
| @@ -144,7 +144,7 @@ static void init_shared_classes(void) | |||
| 144 | 144 | ||
| 145 | #define HARDIRQ_ENTER() \ | 145 | #define HARDIRQ_ENTER() \ |
| 146 | local_irq_disable(); \ | 146 | local_irq_disable(); \ |
| 147 | irq_enter(); \ | 147 | __irq_enter(); \ |
| 148 | WARN_ON(!in_irq()); | 148 | WARN_ON(!in_irq()); |
| 149 | 149 | ||
| 150 | #define HARDIRQ_EXIT() \ | 150 | #define HARDIRQ_EXIT() \ |