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

Commit 710f35e6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: change data type of source_vm* variable to int"

parents 468ae61f 39fa908c

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;