diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /lib/locking-selftest.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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() \ |