summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2014-02-06 12:30:48 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2014-02-06 12:39:11 +0100
commit4a7ac12eedd190cdf071e61145defa73df1675c0 (patch)
tree54ee67a39763b873ebc894c9a2b48eb91a08f512
parentsecurity: select correct default LSM_MMAP_MIN_ADDR on arm on arm64 (diff)
downloadlinux-4a7ac12eedd190cdf071e61145defa73df1675c0.tar.xz
linux-4a7ac12eedd190cdf071e61145defa73df1675c0.zip
arm64: barriers: allow dsb macro to take option parameter
The dsb instruction takes an option specifying both the target access types and shareability domain. This patch allows such an option to be passed to the dsb macro, resulting in potentially more efficient code. Currently the option is ignored until all callers are updated (unlike ARM, the option is mandated by the assembler). Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/include/asm/barrier.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
index 78e20ba8806b..409ca370cfe2 100644
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@ -25,7 +25,7 @@
#define wfi() asm volatile("wfi" : : : "memory")
#define isb() asm volatile("isb" : : : "memory")
-#define dsb() asm volatile("dsb sy" : : : "memory")
+#define dsb(opt) asm volatile("dsb sy" : : : "memory")
#define mb() dsb()
#define rmb() asm volatile("dsb ld" : : : "memory")