diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-06 22:31:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-06 22:31:56 -0700 |
| commit | 3d449c081c4ed38ce8e4fe144dd5f6d6c23f9dcc (patch) | |
| tree | fd601f8fbb76e96b1733a3c71ea725f6ee6e8027 | |
| parent | c079ecdc4edce793a7ebc6a8a998823c3a7d7002 (diff) | |
| parent | bac68423740ef9236f92513225bdf2e08e2c0190 (diff) | |
Merge "ion: change data type of source_vm* variable to int"
| -rw-r--r-- | drivers/staging/android/ion/ion_cma_heap.c | 2 | ||||
| -rw-r--r-- | drivers/staging/android/ion/ion_system_secure_heap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c index b5905fc81147..dfb6d2f77af1 100644 --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/ion_cma_heap.c @@ -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; diff --git a/drivers/staging/android/ion/ion_system_secure_heap.c b/drivers/staging/android/ion/ion_system_secure_heap.c index ec09f9f12b47..803811597f37 100644 --- a/drivers/staging/android/ion/ion_system_secure_heap.c +++ b/drivers/staging/android/ion/ion_system_secure_heap.c @@ -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 * 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) { - u32 source_vmid = VMID_HLOS; + int source_vmid = VMID_HLOS; u32 dest_perms = PERM_READ | PERM_WRITE; struct scatterlist *sg; int ret, i; |