Introduce INIT_WORK_KEY(). lockdep key is static in a function. If a function
uses INIT_WORK() to initialize works for different workqueue, the works will
share a lockdep key incorrectly and cause lockdep fase alarm sometimes.
Next patch will use the new API to solve one ACPI issue.
Signed-off-by: Shaohua Li <shaohua.li@xxxxxxxxx>
---
include/linux/workqueue.h | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
Index: linux/include/linux/workqueue.h
===================================================================
--- linux.orig/include/linux/workqueue.h 2009-12-10 10:14:56.000000000 +0800
+++ linux/include/linux/workqueue.h 2009-12-10 10:39:30.000000000 +0800
@@ -99,15 +99,20 @@ struct execute_work {
* to generate better code.
*/
#ifdef CONFIG_LOCKDEP
-#define INIT_WORK(_work, _func) \
+#define INIT_WORK_KEY(_work, _func, _key, _key_name) \
do { \
- static struct lock_class_key __key; \
- \
(_work)->data = (atomic_long_t) WORK_DATA_INIT(); \
- lockdep_init_map(&(_work)->lockdep_map, #_work, &__key, 0);\
+ lockdep_init_map(&(_work)->lockdep_map, _key_name, \
+ &_key, 0); \
INIT_LIST_HEAD(&(_work)->entry); \
PREPARE_WORK((_work), (_func)); \
} while (0)
+
+#define INIT_WORK(_work, _func) \
+ do { \
+ static struct lock_class_key __key; \
+ INIT_WORK_KEY(_work, _func, __key, #_work); \
+ } while (0)
#else
#define INIT_WORK(_work, _func) \
do { \
@@ -115,6 +120,9 @@ struct execute_work {
INIT_LIST_HEAD(&(_work)->entry); \
PREPARE_WORK((_work), (_func)); \
} while (0)
+
+#define INIT_WORK_KEY(_work, _func, _key, _key_name) \
+ INIT_WORK(_work, _func)
#endif
#define INIT_DELAYED_WORK(_work, _func) \
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
