[PATCH] MIPS: Use ei/di for mipsr2.

[PATCH] MIPS: Use ei/di for mipsr2.

[David Daney]

For mipsr2, use the ei and di instructions to enable and disable
interrupts.

Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/include/asm/asmmacro.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 7a88175..6c8342a 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -35,6 +35,16 @@
 	mtc0	\reg, CP0_TCSTATUS
 	_ehb
 	.endm
+#elif defined(CONFIG_CPU_MIPSR2)
+	.macro	local_irq_enable reg=t0
+	ei
+	irq_enable_hazard
+	.endm
+
+	.macro	local_irq_disable reg=t0
+	di
+	irq_disable_hazard
+	.endm
 #else
 	.macro	local_irq_enable reg=t0
 	mfc0	\reg, CP0_STATUS

Re: [PATCH] MIPS: Use ei/di for mipsr2.

[Ralf Baechle]

On Wed, Dec 10, 2008 at 08:37:25AM -0800, David Daney wrote:

> For mipsr2, use the ei and di instructions to enable and disable
> interrupts.

Thanks for breaking this one out; this is something that was simply
somehow missed when the inline assembler versions were changed.

Applied,

  Ralf