1 files changed, 9 insertions, 0 deletions

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index b5e88fd83277..fd3ef2c2afbc 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -35,6 +35,7 @@
 #include <asm/war.h>
 #include <asm/vdso.h>
 #include <asm/dsp.h>
+#include <asm/inst.h>
 
 #include "signal-common.h"
 
@@ -480,7 +481,15 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
         sigset_t *oldset = sigmask_to_save();
         int ret;
         struct mips_abi *abi = current->thread.abi;
+#ifdef CONFIG_CPU_MICROMIPS
+        void *vdso;
+        unsigned int tmp = (unsigned int)current->mm->context.vdso;
+
+        set_isa16_mode(tmp);
+        vdso = (void *)tmp;
+#else
         void *vdso = current->mm->context.vdso;
+#endif
 
         if (regs->regs[0]) {
                 switch(regs->regs[2]) {