X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-armv.S;h=fc8af43c50001e3c9907ea3f22023a405497da64;hp=9d7ce4377c5ef1e8c2b2aab64c617f0e7253dabb;hb=42578c82e0f1810a07ebe29cb05e874893243d8c;hpb=85d6943af50537d3aec58b967ffbd3fec88453e9;ds=sidebyside

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 9d7ce4377c5e..fc8af43c5000 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -818,10 +818,7 @@ __kuser_helper_start:
  */
 
 __kuser_memory_barrier:				@ 0xffff0fa0
-
-#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_SMP)
-	mcr	p15, 0, r0, c7, c10, 5	@ dmb
-#endif
+	smp_dmb
 	usr_ret	lr
 
 	.align	5