summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Yegoshin <Leonid.Yegoshin@imgtec.com>2014-11-05 13:56:40 +0100
committerMarkos Chandras <markos.chandras@imgtec.com>2015-02-17 16:37:18 +0100
commit226da55f48651c59ae5dc6a46cb4183105e7f17d (patch)
treeee1ef0c550d498e08b119bf6fb5d1c877c37f846
parentMIPS: asm: stackframe: Do not preserve the HI/LO registers on MIPS R6 (diff)
downloadlinux-226da55f48651c59ae5dc6a46cb4183105e7f17d.tar.xz
linux-226da55f48651c59ae5dc6a46cb4183105e7f17d.zip
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>
-rw-r--r--arch/mips/include/asm/asmmacro.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 6caf8766b80f..b6540cfcc97b 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