commit 15265251c5c68fbabdf561cf704e3e305349715a
author Maxime Bizon <mbizon@freebox.fr> Tue Dec 20 06:32:19 2005 +0100
committer <ralf@denk.linux-mips.net> Tue Jan 10 13:39:08 2006 +0000
tree 9805638b9655e4ddcbbdb1c6472f7ba7ce797d60
parent d4ea001dd0912a14967266581601494d94a4c565

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>

include/asm-mips/interrupt.h

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