summaryrefslogtreecommitdiffstats
path: root/include/linux/lockdep.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 13:38:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 13:38:57 -0800
commit5bf7a6503ff416214b9a53569677dbf07657e6fd (patch)
tree0dc8e8dbc30a23d466a327bef05e78c571f2b8a3 /include/linux/lockdep.h
parent0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01 (diff)
parent42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf (diff)
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn't a noop workqueue: relax lockdep annotation on flush_work()
Diffstat (limited to 'include/linux/lockdep.h')
-rw-r--r--include/linux/lockdep.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index f638fd78d10..4aef1dda640 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -514,12 +514,15 @@ static inline void print_irqtrace_events(struct task_struct *curr)
#ifdef CONFIG_DEBUG_LOCK_ALLOC
# ifdef CONFIG_PROVE_LOCKING
# define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 2, NULL, _THIS_IP_)
+# define lock_map_acquire_read(l) lock_acquire(l, 0, 0, 2, 2, NULL, _THIS_IP_)
# else
# define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 1, NULL, _THIS_IP_)
+# define lock_map_acquire_read(l) lock_acquire(l, 0, 0, 2, 1, NULL, _THIS_IP_)
# endif
# define lock_map_release(l) lock_release(l, 1, _THIS_IP_)
#else
# define lock_map_acquire(l) do { } while (0)
+# define lock_map_acquire_read(l) do { } while (0)
# define lock_map_release(l) do { } while (0)
#endif