From 33175403b942076234e081a19b085a8e5fc7dfe2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 26 Mar 2020 11:21:23 +0100 Subject: [PATCH] ANDROID: GKI: workqueue.h: add Android ABI padding to some structures Try to mitigate potential future driver core api changes by adding a padding to struct work_struct and struct delayed_work Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I5492a13e2430c1a5775aec52518144b7aa4f3268 --- include/linux/workqueue.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 26de0cae2a0a..e98cc6dea2b9 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -14,6 +14,7 @@ #include #include #include +#include struct workqueue_struct; @@ -106,6 +107,8 @@ struct work_struct { #ifdef CONFIG_LOCKDEP struct lockdep_map lockdep_map; #endif + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; #define WORK_DATA_INIT() ATOMIC_LONG_INIT((unsigned long)WORK_STRUCT_NO_POOL) @@ -119,6 +122,9 @@ struct delayed_work { /* target workqueue and CPU ->timer uses to queue ->work */ struct workqueue_struct *wq; int cpu; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; struct rcu_work {