Changeset 772 for GPL/trunk/include/linux/workqueue.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/workqueue.h (modified) (2 diffs)

GPL/trunk/include/linux/workqueue.h

@@ -18 +18 @@
         struct timer_list timer;
 };
+
+#define WORK_DATA_STATIC_INIT() \
+        ATOMIC_LONG_INIT((unsigned long)(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC))
 
 struct workqueue_struct {
@@ -52 +55 @@
                 init_timer(&(_work)->timer);            \
         } while (0)
-#define __WORK_INITIALIZER(n, f, d) {                   \
-                .func = (f),                            \
-                .data = (d),                            \
+#define __WORK_INITIALIZER(n, f) {                      \
+        .data = 0,                              \
+        .func = (void(*)(void *))(f),                           \
         }
-#define DECLARE_WORK(n, f, d)                           \
-        struct work_struct n = __WORK_INITIALIZER(n, f, d)
+
+#define DECLARE_WORK(n, f)                                              \
+        struct work_struct n = __WORK_INITIALIZER(n, f)
 
 /* redefine INIT_WORK() */