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

gpu: ion: ion_carveout_heap: fix for 3.4

Browse source 
__arch_ioremap is no longer available, use __arm_ioremap instead.

Signed-off-by: Colin Cross <ccross@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Cross 2013-12-13 14:23:36 -08:00 • committed by Greg Kroah-Hartman
parent c30707be12
commit 0f3cbb59ec
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,14 +99,14 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap,
void *ion_carveout_heap_map_kernel(struct ion_heap *heap, void *ion_carveout_heap_map_kernel(struct ion_heap *heap,
struct ion_buffer *buffer) struct ion_buffer *buffer)
{ {
return __arch_ioremap(buffer->priv_phys, buffer->size, return __arm_ioremap(buffer->priv_phys, buffer->size,
MT_MEMORY_NONCACHED); MT_MEMORY_NONCACHED);
} }
void ion_carveout_heap_unmap_kernel(struct ion_heap *heap, void ion_carveout_heap_unmap_kernel(struct ion_heap *heap,
struct ion_buffer *buffer) struct ion_buffer *buffer)
{ {
__arch_iounmap(buffer->vaddr); __arm_iounmap(buffer->vaddr);
buffer->vaddr = NULL; buffer->vaddr = NULL;
return; return;
} }