evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-06 22:31:56 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3d449c081c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/android/ion/ion_cma_heap.c
View file

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

4
drivers/staging/android/ion/ion_system_secure_heap.c
View file

@ -1,6 +1,6 @@
/* /*
* *
* 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -78,7 +78,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) 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; u32 dest_perms = PERM_READ | PERM_WRITE;
struct scatterlist *sg; struct scatterlist *sg;
int ret, i; int ret, i;