diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
| commit | efab1adba28d9ebbfa86808375fc085c4e84e746 (patch) | |
| tree | c82080ef077c5ea9e50a8308404c599710d6301f /arch/arm64/include/asm/assembler.h | |
| parent | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (diff) | |
| parent | eb7d99ea962fa62f487246462a2777ac918c8895 (diff) | |
Merge remote-tracking branch 'v4.1/topic/PSCI' into linux-linaro-lsk-v4.1lsk-v4.1-16.01
Diffstat (limited to 'arch/arm64/include/asm/assembler.h')
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 144b64ad96c3..706ceaf2577a 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -103,9 +103,7 @@ * SMP data memory barrier */ .macro smp_dmb, opt -#ifdef CONFIG_SMP dmb \opt -#endif .endm #define USER(l, x...) \ |