diff options
| author | Takashi Iwai | 2013-12-04 12:40:59 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2013-12-04 12:40:59 +0100 |
| commit | b0e6989c965dda2f2b65a2abb04f5337b497f4a2 (patch) | |
| tree | eb70ca5f8fc50688f879d1c851fa3f09a6c68850 /arch/arm64/include/asm/irqflags.h | |
| parent | ALSA: hda - Fix missing ELD info when using jackpoll_ms parameter (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/atmel', 'asoc/fi... (diff) | |
| download | kernel-qcow2-linux-b0e6989c965dda2f2b65a2abb04f5337b497f4a2.tar.gz kernel-qcow2-linux-b0e6989c965dda2f2b65a2abb04f5337b497f4a2.tar.xz kernel-qcow2-linux-b0e6989c965dda2f2b65a2abb04f5337b497f4a2.zip | |
Merge tag 'asoc-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A smattering of fixes here, some core ones for the rate combination
issues for things other than simple bitmasks, for readback of byte
controls and for updating the power of value muxes plus a bunch of
driver fixes of varying severity.
The warning fix in the i.MX FIQ driver is fixing a warning introduced
by a previous fix.
Diffstat (limited to 'arch/arm64/include/asm/irqflags.h')
| -rw-r--r-- | arch/arm64/include/asm/irqflags.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h index aa11943b8502..b2fcfbc51ecc 100644 --- a/arch/arm64/include/asm/irqflags.h +++ b/arch/arm64/include/asm/irqflags.h @@ -56,6 +56,9 @@ static inline void arch_local_irq_disable(void) #define local_fiq_enable() asm("msr daifclr, #1" : : : "memory") #define local_fiq_disable() asm("msr daifset, #1" : : : "memory") +#define local_async_enable() asm("msr daifclr, #4" : : : "memory") +#define local_async_disable() asm("msr daifset, #4" : : : "memory") + /* * Save the current interrupt enable state. */ |