Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / arch / mips / kernel / irq.c

diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 5024fa39b8616f97ed48cf59c7475a6104622f3d..d2bfbc2e8995fba3b6da1ad7a190f0d872ca6fbf 100644 (file)
--- 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();
 }
 
 /*