From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 15 Dec 2006 22:13:51 +0000 (-0800)
Subject: Fix "delayed_work_pending()" macro expansion
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0221872a3b0aa2fa2f3fa60affcbaebd662c4a90;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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 {
  * 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