Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8539473 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I5492a13e2430c1a5775aec52518144b7aa4f3268
parent 89cded3a

include/linux/workqueue.h

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/atomic.h>

#include <linux/cpumask.h>

#include <linux/rcupdate.h>

#include <linux/android_kabi.h>



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 {