diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-15 17:13:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-15 17:13:51 -0500 |
| commit | 0221872a3b0aa2fa2f3fa60affcbaebd662c4a90 (patch) | |
| tree | 522c5eca424c5e96ba959620cfc8128694ddd0c8 /include/linux | |
| parent | 701dfbe71903413d10caf2790259bccbabbedcf5 (diff) | |
Fix "delayed_work_pending()" macro expansion
Nobody uses it, but it was still wrong. Using the macro argument name
'work' meant that when we used 'work' as a member name, that would also
get replaced by the macro argument.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/workqueue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index edef8d50b26b..5b13dcf02714 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h | |||
| @@ -121,8 +121,8 @@ struct execute_work { | |||
| 121 | * pending | 121 | * pending |
| 122 | * @work: The work item in question | 122 | * @work: The work item in question |
| 123 | */ | 123 | */ |
| 124 | #define delayed_work_pending(work) \ | 124 | #define delayed_work_pending(w) \ |
| 125 | test_bit(WORK_STRUCT_PENDING, &(work)->work.management) | 125 | work_pending(&(w)->work) |
| 126 | 126 | ||
| 127 | /** | 127 | /** |
| 128 | * work_release - Release a work item under execution | 128 | * work_release - Release a work item under execution |