Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f56c02e1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Icbec584dee3716f341a7831a4810025f690eab4a
parent 3b620d30

include/linux/dma-mapping.h

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/scatterlist.h>

#include <linux/bug.h>

#include <linux/mem_encrypt.h>

#include <linux/android_kabi.h>



/**

 * List of possible attributes associated with a DMA mapping. The semantics
@@ -190,6 +191,11 @@ struct dma_map_ops { 
#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK

	u64 (*get_required_mask)(struct device *dev);

#endif



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

};



extern const struct dma_map_ops dma_direct_ops;