Skip to content

Commit

Permalink
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-u…
Browse files Browse the repository at this point in the history
…pstreaming

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
  • Loading branch information
Linus Torvalds committed Apr 10, 2013
2 parents 51de017 + f934af0 commit eb02db3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/c6x/include/asm/irqflags.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit eb02db3

Please sign in to comment.