diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-27 12:38:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-28 17:41:05 +0200 |
| commit | 29f742f88a32c9ab8cf6d9ba69e1ea918be5aa58 (patch) | |
| tree | a38aa38c8025e050ec82a7e64d02dca07f90ffc7 /lib | |
| parent | Documentation: Add statistics about nested locks (diff) | |
| parent | rcu: Decrease memory-barrier usage based on semi-formal proof (diff) | |
| download | linux-29f742f88a32c9ab8cf6d9ba69e1ea918be5aa58.tar.xz linux-29f742f88a32c9ab8cf6d9ba69e1ea918be5aa58.zip | |
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) #define HARDIRQ_ENTER() \ local_irq_disable(); \ - irq_enter(); \ + __irq_enter(); \ WARN_ON(!in_irq()); #define HARDIRQ_EXIT() \ |