--- zzzz-none-000/linux-4.1.38/arch/arm/include/asm/barrier.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/arch/arm/include/asm/barrier.h	2020-11-25 10:06:48.000000000 +0000
@@ -13,6 +13,10 @@
 #define wfi()	__asm__ __volatile__ ("wfi" : : : "memory")
 #endif
 
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && !defined(CONFIG_BCM947189)
+#include <mach/barriers.h>
+#else /*!(defined(CONFIG_BCM_KF_ARM_BCM963XX)*/
+
 #if __LINUX_ARM_ARCH__ >= 7
 #define isb(option) __asm__ __volatile__ ("isb " #option : : : "memory")
 #define dsb(option) __asm__ __volatile__ ("dsb " #option : : : "memory")
@@ -62,6 +66,7 @@
 #define smp_rmb()	smp_mb()
 #define smp_wmb()	dmb(ishst)
 #endif
+#endif
 
 #define smp_store_release(p, v)						\
 do {									\