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

Commit 39fa908c authored Mar 14, 2017 by Sudarshan Rajagopalan

ion: change data type of source_vm* variable to int



The source_vm* variable is used to hold enum values of type
vmid{}, which has negative values (VMID_INVAL = -1). This variable
is declared as u32 in few functions. Change it to type int.

Change-Id: I4cc546e79a20a843d6bd096ab696913ab40dde6d
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>

parent edc93d8c

drivers/staging/android/ion/ion_cma_heap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@ void ion_cma_heap_destroy(struct ion_heap *heap)
		static void ion_secure_cma_free(struct ion_buffer *buffer)
		{
		int ret = 0;
		u32 source_vm;
		int source_vm;
		int dest_vmid;
		int dest_perms;
		struct ion_cma_buffer_info *info = buffer->priv_virt;

drivers/staging/android/ion/ion_system_secure_heap.c

+2 −2

Original line number	Diff line number	Diff line
		/*
		*
		* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -68,7 +68,7 @@ int ion_system_secure_heap_unassign_sg(struct sg_table *sgt, int source_vmid)

		int ion_system_secure_heap_assign_sg(struct sg_table *sgt, int dest_vmid)
		{
		u32 source_vmid = VMID_HLOS;
		int source_vmid = VMID_HLOS;
		u32 dest_perms = PERM_READ \| PERM_WRITE;
		struct scatterlist *sg;
		int ret, i;