Expose rmem_cma_ops via a kernel/dma-private header so the upcoming lendable-dma-pool reserved-memory handler can wrap the CMA callbacks instead of duplicating them.
Signed-off-by: Vincent Donnefort vdonnefort@google.com --- kernel/dma/contiguous.c | 4 +++- kernel/dma/contiguous.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 kernel/dma/contiguous.h
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 90937dc7c627..22d6e54aea35 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -46,6 +46,8 @@ #include <linux/cma.h> #include <linux/nospec.h>
+#include "contiguous.h" + #ifdef CONFIG_CMA_SIZE_MBYTES #define CMA_SIZE_MBYTES CONFIG_CMA_SIZE_MBYTES #else @@ -578,7 +580,7 @@ static int __init rmem_cma_setup(unsigned long node, struct reserved_mem *rmem) return 0; }
-static const struct reserved_mem_ops rmem_cma_ops = { +const struct reserved_mem_ops rmem_cma_ops = { .node_validate = rmem_cma_validate, .node_fixup = rmem_cma_fixup, .node_init = rmem_cma_setup, diff --git a/kernel/dma/contiguous.h b/kernel/dma/contiguous.h new file mode 100644 index 000000000000..9b1fdbfc794f --- /dev/null +++ b/kernel/dma/contiguous.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _KERNEL_DMA_CONTIGUOUS_H +#define _KERNEL_DMA_CONTIGUOUS_H + +#ifdef CONFIG_OF_RESERVED_MEM +struct reserved_mem_ops; +extern const struct reserved_mem_ops rmem_cma_ops; +#endif + +#endif /* _KERNEL_DMA_CONTIGUOUS_H */