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

ANDROID: GKI: sched: add Android ABI padding to some structures

Browse Source 
Try to mitigate potential future driver core api changes by adding a
padding to struct user_struct and struct sched_domain.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie8f685122767b690a116193aefd8c5e3b6ef8f17
This commit is contained in:
Greg Kroah-Hartman
2020-05-02 09:35:50 +02:00
committed by Todd Kjos
parent 9c4854fa5a
commit d5c344a498
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/sched/topology.h
View File

@@ -3,6 +3,7 @@
#define _LINUX_SCHED_TOPOLOGY_H #define _LINUX_SCHED_TOPOLOGY_H
#include <linux/topology.h> #include <linux/topology.h>
#include <linux/android_kabi.h>
#include <linux/android_vendor.h> #include <linux/android_vendor.h>
#include <linux/sched/idle.h> #include <linux/sched/idle.h>
@@ -146,6 +147,10 @@ struct sched_domain {
struct sched_domain_shared *shared; struct sched_domain_shared *shared;
unsigned int span_weight; unsigned int span_weight;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
/* /*
* Span of all CPUs in this domain. * Span of all CPUs in this domain.
* *

4
include/linux/sched/user.h
View File

@@ -6,6 +6,7 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/android_kabi.h>
/* /*
* Some day this will be a full-fledged user tracking system.. * Some day this will be a full-fledged user tracking system..
@@ -42,6 +43,9 @@ struct user_struct {
/* Miscellaneous per-user rate limit */ /* Miscellaneous per-user rate limit */
struct ratelimit_state ratelimit; struct ratelimit_state ratelimit;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_OEM_DATA_ARRAY(1, 2); ANDROID_OEM_DATA_ARRAY(1, 2);
}; };