Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / compat_signal.c

diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 009f5eb111254028125104ccbf25566d2d72c5fa..34d5fa7b01b50e6b31a805503305a85993b90cb8 100644 (file)
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -434,7 +434,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set,
                        ksig->ka.sa.sa_restorer | PSW32_ADDR_AMODE;
        } else {
                /* Signal frames without vectors registers are short ! */
-               __u16 __user *svc = (void *) frame + frame_size - 2;
+               __u16 __user *svc = (void __user *) frame + frame_size - 2;
                if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn, svc))
                        return -EFAULT;
                restorer = (unsigned long __force) svc | PSW32_ADDR_AMODE;