[PATCH 002/115] gpu: ion: ion_carveout_heap: fix for 3.4

John Stultz
2013-12-13T22:26:11Z

From: Colin Cross <ccross@android.com>

__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>
---
drivers/staging/android/ion/ion_carveout_heap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index 6d02cd3..e8c4e36 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -99,14 +99,14 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap,
void *ion_carveout_heap_map_kernel(struct ion_heap *heap,
struct ion_buffer *buffer)
{
- return __arch_ioremap(buffer->priv_phys, buffer->size,
+ return __arm_ioremap(buffer->priv_phys, buffer->size,
MT_MEMORY_NONCACHED);
}

void ion_carveout_heap_unmap_kernel(struct ion_heap *heap,
struct ion_buffer *buffer)
{
- __arch_iounmap(buffer->vaddr);
+ __arm_iounmap(buffer->vaddr);
buffer->vaddr = NULL;
return;
}
--
1.8.3.2