Merge tag 'm68knommu-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / m68k / kernel / signal.c

diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index a98fca97707375aab338e9f06ab6e9611da97bdf..a85f59bc1c356c47916442b722fff3009bb45dd1 100644 (file)
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -920,7 +920,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
        err |= __put_user(0x70004e40 + (__NR_sigreturn << 16),
                          (long __user *)(frame->retcode));
 #else
-       err |= __put_user((void *) ret_from_user_signal, &frame->pretcode);
+       err |= __put_user((long) ret_from_user_signal,
+                         (long __user *) &frame->pretcode);
 #endif
 
        if (err)
@@ -1004,7 +1005,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4));
 #endif
 #else
-       err |= __put_user((void *) ret_from_user_rt_signal, &frame->pretcode);
+       err |= __put_user((long) ret_from_user_rt_signal,
+                         (long __user *) &frame->pretcode);
 #endif /* CONFIG_MMU */
 
        if (err)