--- zzzz-none-000/linux-4.4.60/arch/arm/mm/cache-v7.S	2017-04-08 07:53:53.000000000 +0000
+++ hawkeye-5590-729/linux-4.4.60/arch/arm/mm/cache-v7.S	2022-03-30 14:21:51.000000000 +0000
@@ -273,7 +273,7 @@
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r12, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -326,7 +326,7 @@
 	add	r1, r0, r1
 	sub	r3, r2, #1
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -349,12 +349,12 @@
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
-v7_dma_inv_range:
+ENTRY(v7_dma_inv_range)
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	tst	r0, r3
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -377,11 +377,11 @@
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
-v7_dma_clean_range:
+ENTRY(v7_dma_clean_range)
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -403,7 +403,7 @@
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif