From aea5e1c230289122e0de23939488b8de0fcd93dd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Apr 2020 15:50:51 +0200 Subject: [PATCH] ANDROID: GKI: elevator: add Android ABI padding to some structures Try to mitigate potential future driver core api changes by adding a padding to struct elevator_mq_ops and struct elevator_type. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: Ia4c2667fd5ca9e6dd2e0d30b95a0f8d5eb7921dc --- include/linux/elevator.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/elevator.h b/include/linux/elevator.h index dcb2f9022c1d..0c75ed0604aa 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -4,6 +4,7 @@ #include #include +#include #ifdef CONFIG_BLOCK @@ -50,6 +51,11 @@ struct elevator_mq_ops { struct request *(*next_request)(struct request_queue *, struct request *); void (*init_icq)(struct io_cq *); void (*exit_icq)(struct io_cq *); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; #define ELV_NAME_MAX (16) @@ -86,6 +92,9 @@ struct elevator_type /* managed by elevator core */ char icq_cache_name[ELV_NAME_MAX + 6]; /* elvname + "_io_cq" */ struct list_head list; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; #define ELV_HASH_BITS 6