diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 16:38:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 16:38:57 -0500 |
commit | 5bf7a6503ff416214b9a53569677dbf07657e6fd (patch) | |
tree | 0dc8e8dbc30a23d466a327bef05e78c571f2b8a3 /include | |
parent | 0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01 (diff) | |
parent | 42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf (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')
-rw-r--r-- | include/linux/lockdep.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index f638fd78d106..4aef1dda6406 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) | |||
514 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 514 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
515 | # ifdef CONFIG_PROVE_LOCKING | 515 | # ifdef CONFIG_PROVE_LOCKING |
516 | # define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 2, NULL, _THIS_IP_) | 516 | # define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 2, NULL, _THIS_IP_) |
517 | # define lock_map_acquire_read(l) lock_acquire(l, 0, 0, 2, 2, NULL, _THIS_IP_) | ||
517 | # else | 518 | # else |
518 | # define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 1, NULL, _THIS_IP_) | 519 | # define lock_map_acquire(l) lock_acquire(l, 0, 0, 0, 1, NULL, _THIS_IP_) |
520 | # define lock_map_acquire_read(l) lock_acquire(l, 0, 0, 2, 1, NULL, _THIS_IP_) | ||
519 | # endif | 521 | # endif |
520 | # define lock_map_release(l) lock_release(l, 1, _THIS_IP_) | 522 | # define lock_map_release(l) lock_release(l, 1, _THIS_IP_) |
521 | #else | 523 | #else |
522 | # define lock_map_acquire(l) do { } while (0) | 524 | # define lock_map_acquire(l) do { } while (0) |
525 | # define lock_map_acquire_read(l) do { } while (0) | ||
523 | # define lock_map_release(l) do { } while (0) | 526 | # define lock_map_release(l) do { } while (0) |
524 | #endif | 527 | #endif |
525 | 528 | ||