Messages in this thread Patch in this message | | | From | Max Kellermann <> | Subject | [PATCH 04/28] workqueue.h: move struct delayed_work to workqueue_types.h | Date | Wed, 31 Jan 2024 15:49:44 +0100 |
| |
This allows including workqueue_types.h instead of workqueue.h in some headers.
Signed-off-by: Max Kellermann <max.kellermann@ionos.com> --- include/linux/can/dev.h | 2 +- include/linux/jump_label_ratelimit.h | 2 +- include/linux/kobject.h | 5 ++++- include/linux/workqueue.h | 9 --------- include/linux/workqueue_types.h | 9 +++++++++ include/net/netns/ipv6.h | 2 +- include/sound/soc.h | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 332ece824fde..91cf56179c13 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -22,7 +22,7 @@ #include <linux/can/skb.h> #include <linux/ethtool.h> #include <linux/netdevice.h> -#include <linux/workqueue.h> // for struct delayed_work +#include <linux/workqueue_types.h> // for struct delayed_work /* * CAN mode diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h index 8c3ee291b2d8..2b5095d3dea2 100644 --- a/include/linux/jump_label_ratelimit.h +++ b/include/linux/jump_label_ratelimit.h @@ -3,7 +3,7 @@ #define _LINUX_JUMP_LABEL_RATELIMIT_H #include <linux/jump_label.h> -#include <linux/workqueue.h> +#include <linux/workqueue_types.h> #if defined(CONFIG_JUMP_LABEL) struct static_key_deferred { diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 1d58fc9f6ffb..774db9d28800 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -23,9 +23,12 @@ #include <linux/spinlock_types.h> #include <linux/kref.h> #include <linux/kobject_ns.h> -#include <linux/workqueue.h> #include <linux/uidgid_types.h> +#ifdef CONFIG_DEBUG_KOBJECT_RELEASE +#include <linux/workqueue_types.h> +#endif + #define UEVENT_HELPER_PATH_LEN 256 #define UEVENT_NUM_ENVP 64 /* number of env pointers */ #define UEVENT_BUFFER_SIZE 2048 /* buffer for the variables */ diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 232baea90a1d..0ada28ebbe16 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -99,15 +99,6 @@ enum wq_misc_consts { #define WORK_DATA_STATIC_INIT() \ ATOMIC_LONG_INIT((unsigned long)(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC)) -struct delayed_work { - struct work_struct work; - struct timer_list timer; - - /* target workqueue and CPU ->timer uses to queue ->work */ - struct workqueue_struct *wq; - int cpu; -}; - struct rcu_work { struct work_struct work; struct rcu_head rcu; diff --git a/include/linux/workqueue_types.h b/include/linux/workqueue_types.h index 4c38824f3ab4..e16aaa7a6661 100644 --- a/include/linux/workqueue_types.h +++ b/include/linux/workqueue_types.h @@ -22,4 +22,13 @@ struct work_struct { #endif }; +struct delayed_work { + struct work_struct work; + struct timer_list timer; + + /* target workqueue and CPU ->timer uses to queue ->work */ + struct workqueue_struct *wq; + int cpu; +}; + #endif /* _LINUX_WORKQUEUE_TYPES_H */ diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 858ee28e73f9..30a55f462264 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -6,7 +6,7 @@ #include <linux/list.h> #include <linux/spinlock_types.h> #include <linux/rwlock_types.h> -#include <linux/workqueue.h> // for struct delayed_work +#include <linux/workqueue_types.h> // for struct delayed_work #include <net/inet_frag.h> #ifndef __NETNS_IPV6_H__ diff --git a/include/sound/soc.h b/include/sound/soc.h index 6defc5547ff9..0021d54625da 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -15,7 +15,7 @@ #include <linux/platform_device.h> #include <linux/types.h> #include <linux/notifier.h> -#include <linux/workqueue.h> +#include <linux/workqueue_types.h> #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/regmap.h> -- 2.39.2
| |