From e319ef95b6e4694dbd00fe72bd6d4358cc8671f0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 May 2020 09:36:40 +0200 Subject: [PATCH] ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure Try to mitigate potential future driver core api changes by adding a padding to struct dma_map_ops. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: Icbec584dee3716f341a7831a4810025f690eab4a --- include/linux/dma-map-ops.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index a514c1269de5..80ccaaf47006 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -8,6 +8,7 @@ #include #include +#include struct cma; @@ -81,6 +82,11 @@ struct dma_map_ops { size_t (*max_mapping_size)(struct device *dev); size_t (*opt_mapping_size)(void); unsigned long (*get_merge_boundary)(struct device *dev); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; #ifdef CONFIG_DMA_OPS