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

Commit 6dad06cc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: msm: Upgrade the ION ABI version"

parents 6789de4c daed9052

drivers/staging/android/ion/heaps/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_ION_MSM_HEAPS) += msm_ion_heaps.o

msm_ion_heaps-objs += msm_ion_of.o msm_ion_dma_buf.o ion_page_pool.o \

msm_ion_heaps-objs += msm_ion.o msm_ion_dma_buf.o ion_page_pool.o \

		ion_system_heap.o ion_carveout_heap.o ion_system_secure_heap.o \

		ion_cma_heap.o ion_secure_util.o

drivers/staging/android/ion/heaps/msm_ion_of.c→drivers/staging/android/ion/heaps/msm_ion.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/of_address.h>

#include <linux/dma-contiguous.h>

#include <linux/cma.h>

#include <linux/msm_ion_of.h>

#include <linux/msm_ion.h>

#include "msm_ion_priv.h"



#define ION_COMPAT_STR	"qcom,msm-ion"

include/linux/msm_ion_of.h→include/linux/msm_ion.h

+3 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 */



#ifndef _MSM_ION_OF_H

#define _MSM_ION_OF_H

#ifndef _MSM_ION_H

#define _MSM_ION_H



#include <linux/device.h>

#include <uapi/linux/msm_ion.h>
@@ -21,4 +21,4 @@ static inline struct device *msm_ion_heap_device_by_id(int heap_id) 
}



#endif /* CONFIG_ION_MSM_HEAPS */

#endif /* _MSM_ION_OF_H */
 
#endif /* _MSM_ION_H */

include/uapi/linux/msm_ion.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * compile time only their code which uses the appropriate ION APIs for

 * this kernel is included.

 */

#define TARGET_ION_ABI_VERSION 2

#define TARGET_ION_ABI_VERSION 3



enum msm_ion_heap_types {

	ION_HEAP_TYPE_MSM_START = 16,