diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 06:13:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 06:13:06 -0400 |
| commit | 710054ba25c0d1f8f41c22ce13ba336503fb5318 (patch) | |
| tree | f9b09b722bf511841539173d946f90a20fc2e59a /lib/locking-selftest.c | |
| parent | 74c355fbdfedd3820046dba4f537876cea54c207 (diff) | |
| parent | b273fa9716aa1564bee88ceee62f9042981cdc81 (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
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() \ |