Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / mips / kernel / signal.c

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 16f1e4f..545bf11 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;