MIPS: R2: Fix local_irq_save()

    
local_irq_restore uses di which saves the whole status content, not
just the IE bit resulting in  local_irq_restore() to fail.  This only
happens if both CONFIG_CPU_MIPSR2 and CONFIG_IRQ_CPU are enabled.
    
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/include/asm-mips/interrupt.h b/include/asm-mips/interrupt.h
index a5735761f5e5..abdf54ee64cf 100644
--- a/include/asm-mips/interrupt.h
+++ b/include/asm-mips/interrupt.h
@@ -93,6 +93,7 @@ __asm__ (
         "       .set    noat                                            \n"
 #ifdef CONFIG_CPU_MIPSR2
         "       di      \\result                                        \n"
+        "       andi    \\result, 1                                     \n"
 #else
         "       mfc0    \\result, $12                                   \n"
         "       ori     $1, \\result, 1                                 \n"