diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 23:14:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 23:14:27 +0200 |
| commit | eb02db38ee6da074628685971042b847dee05d43 (patch) | |
| tree | 08088abca80269e5ccc86203a3d6cb9de3ee4e56 /arch | |
| parent | Merge tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | add memory barrier to arch_local_irq_restore (diff) | |
| download | linux-eb02db38ee6da074628685971042b847dee05d43.tar.xz linux-eb02db38ee6da074628685971042b847dee05d43.zip | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull C6X fix from Mark Salter.
Final (?) fix from the barrier discussion.
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
add memory barrier to arch_local_irq_restore
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/c6x/include/asm/irqflags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/c6x/include/asm/irqflags.h b/arch/c6x/include/asm/irqflags.h index cf78e09e18c3..2c71d5634ec2 100644 --- a/arch/c6x/include/asm/irqflags.h +++ b/arch/c6x/include/asm/irqflags.h @@ -27,7 +27,7 @@ static inline unsigned long arch_local_save_flags(void) /* set interrupt enabled status */ static inline void arch_local_irq_restore(unsigned long flags) { - asm volatile (" mvc .s2 %0,CSR\n" : : "b"(flags)); + asm volatile (" mvc .s2 %0,CSR\n" : : "b"(flags) : "memory"); } /* unconditionally enable interrupts */ |