commit 226da55f48651c59ae5dc6a46cb4183105e7f17d
author Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> Wed Nov 05 12:56:40 2014 +0000
committer Markos Chandras <markos.chandras@imgtec.com> Tue Feb 17 15:37:18 2015 +0000
tree ee1ef0c550d498e08b119bf6fb5d1c877c37f846
parent 6a0e9865b9003ba2bb1c3135dd99185946fa7159

MIPS: asm: asmmacro: Add MIPS R6 support to the simple EI/DI variants

EI/DI instructions are available in MIPS R6 so add the needed
definitions.

Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>

arch/mips/include/asm/asmmacro.h

diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 6caf876..b6540cf 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -19,7 +19,7 @@
 #include <asm/asmmacro-64.h>
 #endif
 
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 	.macro	local_irq_enable reg=t0
 	ei
 	irq_enable_hazard