From ae3c0ab38343d818d6d36da55ce2f2df23cddee1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 May 2020 09:41:26 +0200 Subject: [PATCH] ANDROID: GKI: mm.h: add Android ABI padding to a structure Try to mitigate potential future driver core api changes by adding a padding to struct vm_operations_struct. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I78f84148ef4d3524bd6c5b78e53e06503a4ac3ae --- include/linux/mm.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index b036d67ace0f..b0399699bbdb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -32,6 +32,7 @@ #include #include #include +#include struct mempolicy; struct anon_vma; @@ -670,6 +671,11 @@ struct vm_operations_struct { * run within an rcu read locked section and with mmap lock not held. */ bool speculative; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; static inline void vma_init(struct vm_area_struct *vma, struct mm_struct *mm)