From c2def2a218a4dd04a5605e1e50e786177076da63 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 22 Aug 2017 13:48:22 +0100
Subject: [PATCH] cache: Fix up previous commit for v6

---
 arch/arm/mm/cache-v6.S                | 2 ++
 arch/arm/mm/cache-v7.S                | 6 ++++--
 drivers/char/broadcom/vc_sm/vmcs_sm.c | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
index 24659952c278..45d221ea805e 100644
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@ -201,6 +201,7 @@ ENTRY(v6_flush_kern_dcache_area)
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
+ENTRY(rpi_dma_inv_range)
 v6_dma_inv_range:
 #ifdef CONFIG_DMA_CACHE_RWFO
 	ldrb	r2, [r0]			@ read for ownership
@@ -246,6 +247,7 @@ v6_dma_inv_range:
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
+ENTRY(rpi_dma_clean_range)
 v6_dma_clean_range:
 	bic	r0, r0, #D_CACHE_LINE_SIZE - 1
 1:
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 2ddf36403d1c..48a81f3757d4 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -349,7 +349,8 @@ ENDPROC(v7_flush_kern_dcache_area)
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
-ENTRY(v7_dma_inv_range)
+ENTRY(rpi_dma_inv_range)
+v7_dma_inv_range:
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	tst	r0, r3
@@ -377,7 +378,8 @@ ENDPROC(v7_dma_inv_range)
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
-ENTRY(v7_dma_clean_range)
+ENTRY(rpi_dma_clean_range)
+v7_dma_clean_range:
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r0, r0, r3
diff --git a/drivers/char/broadcom/vc_sm/vmcs_sm.c b/drivers/char/broadcom/vc_sm/vmcs_sm.c
index cc8a3969cf38..dda21c2fe746 100644
--- a/drivers/char/broadcom/vc_sm/vmcs_sm.c
+++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c
@@ -2845,15 +2845,15 @@ static long vc_sm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				for (i=0; i<ioparam.op_count; i++) {
 					struct vmcs_sm_ioctl_clean_invalid_block *op = block + i;
 					for (j = 0; j < op->block_count; ++j) {
-						extern void v7_dma_inv_range(void *start, void *end);
-						extern void v7_dma_clean_range(void *start, void *end);
+						extern void rpi_dma_inv_range(void *start, void *end);
+						extern void rpi_dma_clean_range(void *start, void *end);
 						unsigned long base = (unsigned long)op->start_address + j * op->inter_block_stride;
 						unsigned long end = base + op->block_size;
 						/* L1/L2 cache clean/invalidate */
 						if (op->invalidate_mode == 1)
-							v7_dma_inv_range((void *)base, (void *)end);
+							rpi_dma_inv_range((void *)base, (void *)end);
 						else
-							v7_dma_clean_range((void *)base, (void *)end);
+							rpi_dma_clean_range((void *)base, (void *)end);
 					}
 				}
 				kfree(block);
-- 
2.30.2