From 31f6b7a1ae694953772bcb3827e0b9988993a563 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 May 2020 09:40:02 +0200 Subject: [PATCH] ANDROID: GKI: kernfs.h: add Android ABI padding to some structures Try to mitigate potential future driver core api changes by adding a padding to struct kernfs_syscall_ops and struct kernfs_ops. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I1fcb0b81c3ea7d5300da283b275391f95d6d4ec8 --- include/linux/kernfs.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index 89f6a4214a70..c8529e9fa8de 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -16,6 +16,7 @@ #include #include #include +#include struct file; struct dentry; @@ -175,6 +176,11 @@ struct kernfs_syscall_ops { const char *new_name); int (*show_path)(struct seq_file *sf, struct kernfs_node *kn, struct kernfs_root *root); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; struct kernfs_root { @@ -268,6 +274,9 @@ struct kernfs_ops { #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key lockdep_key; #endif + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; /*