From 02c55808f34bc3aa8424fc18226b8163b733d027 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 3 Oct 2019 22:58:43 -0700 Subject: [PATCH] ion: msm: Fix several errors in the MSM ION kernel header ION clients that reside in the kernel may need information that is present in the UAPI header, such as flags to specify memory attributes, or IDs to allocate from different heaps, so include the UAPI header in the kernel space header. Also, ensure that drivers that use this header can still compile even when CONFIG_ION_MSM_HEAPS is not set. Change-Id: If030a58ce62b73b66b337b6dfc6a607bbc0ce193 Signed-off-by: Isaac J. Manjarres --- include/linux/msm_ion_of.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/msm_ion_of.h b/include/linux/msm_ion_of.h index 1492eca8451f..d1252ff621a9 100644 --- a/include/linux/msm_ion_of.h +++ b/include/linux/msm_ion_of.h @@ -3,9 +3,22 @@ * Copyright (c) 2019, The Linux Foundation. All rights reserved. */ -#ifndef _MSM_ION_KERNEL_H -#define _MSM_ION_KERNEL_H +#ifndef _MSM_ION_OF_H +#define _MSM_ION_OF_H + +#include +#include + +#if IS_ENABLED(CONFIG_ION_MSM_HEAPS) struct device *msm_ion_heap_device_by_id(int heap_id); -#endif /* _MSM_ION_H */ +#else + +static inline struct device *msm_ion_heap_device_by_id(int heap_id) +{ + return ERR_PTR(-ENODEV); +} + +#endif /* CONFIG_ION_MSM_HEAPS */ +#endif /* _MSM_ION_OF_H */