summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/irq.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2014-03-13 19:00:36 +0100
committerIngo Molnar <mingo@kernel.org>2014-04-18 14:20:38 +0200
commit91bbefe6b0fcd2968c34a5a566bda870477afc82 (patch)
tree47dafcecaefe7838ab8aea458bd85fde3131b453 /arch/mips/kernel/irq.c
parent40074dece684fc61ab72cfc1689d564cba1c5f64 (diff)
downloadlinux-91bbefe6b0fcd2968c34a5a566bda870477afc82.tar.gz
linux-91bbefe6b0fcd2968c34a5a566bda870477afc82.tar.bz2
linux-91bbefe6b0fcd2968c34a5a566bda870477afc82.zip
arch,mips: Convert smp_mb__*()
MIPS is interesting and has hardware variants that reorder over ll/sc as well as those that do not. Implement the 2 new barrier functions as per the old barriers. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Link: http://lkml.kernel.org/n/tip-9ph49jbae3hol9v721sbc2g6@git.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Maciej W. Rozycki" <macro@codesourcery.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/kernel/irq.c')
-rw-r--r--arch/mips/kernel/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index d1fea7a054be..1818da4dbb85 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -62,9 +62,9 @@ void __init alloc_legacy_irqno(void)
void free_irqno(unsigned int irq)
{
- smp_mb__before_clear_bit();
+ smp_mb__before_atomic();
clear_bit(irq, irq_map);
- smp_mb__after_clear_bit();
+ smp_mb__after_atomic();
}
/*