diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 15:56:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 15:56:32 -0400 |
| commit | 1ba4b8cb94e59b17fd0142a509eb583695c36db6 (patch) | |
| tree | e42d1967025670401758d32964a5fa048f59f10a /lib/locking-selftest.c | |
| parent | c4a227d89f758e582fd167bb15245f2704de99ef (diff) | |
| parent | cc3ce5176d83cd8ae1134f86e208ea758d6cb78e (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: Start RCU kthreads in TASK_INTERRUPTIBLE state
rcu: Remove waitqueue usage for cpu, node, and boost kthreads
rcu: Avoid acquiring rcu_node locks in timer functions
atomic: Add atomic_or()
Documentation: Add statistics about nested locks
rcu: Decrease memory-barrier usage based on semi-formal proof
rcu: Make rcu_enter_nohz() pay attention to nesting
rcu: Don't do reschedule unless in irq
rcu: Remove old memory barriers from rcu_process_callbacks()
rcu: Add memory barriers
rcu: Fix unpaired rcu_irq_enter() from locking selftests
Diffstat (limited to 'lib/locking-selftest.c')
| -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() \ |