From edc0b633e4f5540b735bf086d7848a949c99f4cd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 May 2020 09:39:35 +0200 Subject: [PATCH] ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure Try to mitigate potential future driver core api changes by adding a padding to struct irq_domain. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I8ff0c2162ca5f7f0b6c7a51bf341c6b1b1c856e8 --- include/linux/irqdomain.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 6b7b35b5394e..20b263dcce39 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -35,6 +35,7 @@ #include #include #include +#include struct device_node; struct irq_domain; @@ -177,6 +178,11 @@ struct irq_domain { struct dentry *debugfs_file; #endif + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); + /* reverse map data. The linear map gets appended to the irq_domain */ irq_hw_number_t hwirq_max; unsigned int revmap_direct_max_irq;