Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / arch / mips / kernel / signal.c

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 16f1e4f2bf3c3c08896161106529b4a0c551dd9e..545bf11bd2edb42fc05b37e2db9bb993be3abc4e 100644 (file)
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -530,7 +530,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
        struct mips_abi *abi = current->thread.abi;
 #ifdef CONFIG_CPU_MICROMIPS
        void *vdso;
-       unsigned int tmp = (unsigned int)current->mm->context.vdso;
+       unsigned long tmp = (unsigned long)current->mm->context.vdso;
 
        set_isa16_mode(tmp);
        vdso = (void *)tmp;