diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
| commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
| tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /arch/arm64/include/asm/barrier.h | |
| parent | ALSA: hda - Avoid codec D3 for keeping mute LED up on Lenovo Yxx0 (diff) | |
| parent | ALSA: hda - Add a fixup for HP Folio 13 mute LED (diff) | |
| download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.zip | |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'arch/arm64/include/asm/barrier.h')
| -rw-r--r-- | arch/arm64/include/asm/barrier.h | 2 |
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") |