From 1f0404339bacfce164b4c4975e095cf3bc7f3094 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 12 Aug 2020 17:49:43 +0200 Subject: [PATCH] ANDROID: GKI: add some padding to some driver core structures It was requested that the following structures get some padding in order to be able to handle future issues/bugs/fixes that might arise: struct dev_links_info struct device_link struct fwnode_handle Bug: 163662096 Signed-off-by: Greg Kroah-Hartman Change-Id: Ie26f422c590f9ddbe99f0885f36da3feec64e9a6 Signed-off-by: Will McVicker --- include/linux/device.h | 10 ++++++++++ include/linux/fwnode.h | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/include/linux/device.h b/include/linux/device.h index 7726a1b8fceb..6b0e3448e115 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -901,6 +901,11 @@ struct device_link { struct rcu_head rcu_head; #endif bool supplier_preactivated; /* Owned by consumer probe. */ + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; /** @@ -934,6 +939,11 @@ struct dev_links_info { struct list_head defer_sync; bool need_for_probe; enum dl_dev_state status; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; /** diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h index a497b9d97f5a..becec51ec9e5 100644 --- a/include/linux/fwnode.h +++ b/include/linux/fwnode.h @@ -13,6 +13,7 @@ #define _LINUX_FWNODE_H_ #include +#include struct fwnode_operations; struct device; @@ -21,6 +22,11 @@ struct fwnode_handle { struct fwnode_handle *secondary; const struct fwnode_operations *ops; struct device *dev; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; /**