github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: GKI: kernfs.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 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 <gregkh@google.com>
Change-Id: I1fcb0b81c3ea7d5300da283b275391f95d6d4ec8
This commit is contained in:
Greg Kroah-Hartman 2020-05-02 09:40:02 +02:00
parent 1a517d8668
commit 31f6b7a1ae
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/kernfs.h
View File

@ -16,6 +16,7 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/uidgid.h> #include <linux/uidgid.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/android_kabi.h>
struct file; struct file;
struct dentry; struct dentry;
@ -175,6 +176,11 @@ struct kernfs_syscall_ops {
const char *new_name); const char *new_name);
int (*show_path)(struct seq_file *sf, struct kernfs_node *kn, int (*show_path)(struct seq_file *sf, struct kernfs_node *kn,
struct kernfs_root *root); struct kernfs_root *root);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
struct kernfs_root { struct kernfs_root {
@ -268,6 +274,9 @@ struct kernfs_ops {
#ifdef CONFIG_DEBUG_LOCK_ALLOC #ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lock_class_key lockdep_key; struct lock_class_key lockdep_key;
#endif #endif
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
/* /*