summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-15 14:13:51 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-15 14:13:51 -0800
commit0221872a3b0aa2fa2f3fa60affcbaebd662c4a90 (patch)
tree522c5eca424c5e96ba959620cfc8128694ddd0c8
parent701dfbe71903413d10caf2790259bccbabbedcf5 (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>
-rw-r--r--include/linux/workqueue.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index edef8d50b26..5b13dcf0271 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -121,8 +121,8 @@ struct execute_work {
* pending
* @work: The work item in question
*/
-#define delayed_work_pending(work) \
- test_bit(WORK_STRUCT_PENDING, &(work)->work.management)
+#define delayed_work_pending(w) \
+ work_pending(&(w)->work)
/**
* work_release - Release a work item under execution