hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I9089C CVE: NA
-------------------------------
Reserve space for workqueue subsystem.
Signed-off-by: Zeng Heng zengheng4@huawei.com --- include/linux/workqueue.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 24b1e5070f4d..39c67393e13b 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -6,6 +6,7 @@ #ifndef _LINUX_WORKQUEUE_H #define _LINUX_WORKQUEUE_H
+#include <linux/kabi.h> #include <linux/timer.h> #include <linux/linkage.h> #include <linux/bitops.h> @@ -102,6 +103,9 @@ struct work_struct { #ifdef CONFIG_LOCKDEP struct lockdep_map lockdep_map; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define WORK_DATA_INIT() ATOMIC_LONG_INIT((unsigned long)WORK_STRUCT_NO_POOL) @@ -115,6 +119,9 @@ struct delayed_work { /* target workqueue and CPU ->timer uses to queue ->work */ struct workqueue_struct *wq; int cpu; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct rcu_work { @@ -201,6 +208,11 @@ struct workqueue_attrs { * @ordered: work items must be executed one by one in queueing order */ bool ordered; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
static inline struct delayed_work *to_delayed_work(struct work_struct *work)
反馈: 您发送到kernel@openeuler.org的补丁/补丁集,转换为PR失败! 邮件列表地址:https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/R... 失败原因:应用补丁/补丁集失败,Patch failed at 0001 kabi: reserve space for workqueue subsystem related structure 建议解决方法:请查看失败原因, 确认补丁是否可以应用在当前期望分支的最新代码上
FeedBack: The patch(es) which you have sent to kernel@openeuler.org has been converted to PR failed! Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/R... Failed Reason: apply patch(es) failed, Patch failed at 0001 kabi: reserve space for workqueue subsystem related structure Suggest Solution: please checkout if the failed patch(es) can work on the newest codes in expected branch