xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: workqueue.h: add Android ABI padding to some structures

Browse Source 
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 <gregkh@google.com>
Change-Id: I5492a13e2430c1a5775aec52518144b7aa4f3268
This commit is contained in:
Greg Kroah-Hartman
2020-03-26 11:21:23 +01:00
committed by Todd Kjos
parent d5c344a498
commit 33175403b9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/workqueue.h
View File

@@ -14,6 +14,7 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/android_kabi.h>
struct workqueue_struct; struct workqueue_struct;
@@ -106,6 +107,8 @@ struct work_struct {
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
struct lockdep_map lockdep_map; struct lockdep_map lockdep_map;
#endif #endif
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
#define WORK_DATA_INIT() ATOMIC_LONG_INIT((unsigned long)WORK_STRUCT_NO_POOL) #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 */ /* target workqueue and CPU ->timer uses to queue ->work */
struct workqueue_struct *wq; struct workqueue_struct *wq;
int cpu; int cpu;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
struct rcu_work { struct rcu_work {