projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6]
/
arch
/
arm
/
include
/
asm
/
assembler.h
diff --git
a/arch/arm/include/asm/assembler.h
b/arch/arm/include/asm/assembler.h
index
6116e48
..
15f8a09
100644
(file)
--- a/
arch/arm/include/asm/assembler.h
+++ b/
arch/arm/include/asm/assembler.h
@@
-114,3
+114,16
@@
.align 3; \
.long 9999b,9001f; \
.previous
+
+/*
+ * SMP data memory barrier
+ */
+ .macro smp_dmb
+#ifdef CONFIG_SMP
+#if __LINUX_ARM_ARCH__ >= 7
+ dmb
+#elif __LINUX_ARM_ARCH__ == 6
+ mcr p15, 0, r0, c7, c10, 5 @ dmb
+#endif
+#endif
+ .endm