Commit 0f3cbb59 authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman

gpu: ion: ion_carveout_heap: fix for 3.4

__arch_ioremap is no longer available, use __arm_ioremap instead.
Signed-off-by: default avatarColin Cross <ccross@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c30707be
...@@ -99,14 +99,14 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap, ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment