Skip to content

Commit 0069674

Browse files
author
Greg Ungerer
committed
m68knommu: fix sparse warnings in signal code
Commit 858b810 ("m68knommu: switch to using asm-generic/uaccess.h") cleaned up a number of sparse warnings associated with lack of __user annotations. It also uncovered a couple of more in the signal handling code: arch/m68k/kernel/signal.c:923:16: expected char [noderef] __user *__x arch/m68k/kernel/signal.c:923:16: got void * arch/m68k/kernel/signal.c:1007:16: warning: incorrect type in initializer (different address spaces) arch/m68k/kernel/signal.c:1007:16: expected char [noderef] __user *__x arch/m68k/kernel/signal.c:1007:16: got void * arch/m68k/kernel/signal.c:1132:6: warning: symbol 'do_notify_resume' was not declared. Should it be static? These are specific to a non-MMU configuration. Fix these inserting the correct __user annotations as required. Reported-by: kernel test robot <[email protected]> Signed-off-by: Greg Ungerer <[email protected]>
1 parent a27bc11 commit 0069674

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

arch/m68k/kernel/signal.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
920920
err |= __put_user(0x70004e40 + (__NR_sigreturn << 16),
921921
(long __user *)(frame->retcode));
922922
#else
923-
err |= __put_user((void *) ret_from_user_signal, &frame->pretcode);
923+
err |= __put_user((long) ret_from_user_signal,
924+
(long __user *) &frame->pretcode);
924925
#endif
925926

926927
if (err)
@@ -1004,7 +1005,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
10041005
err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4));
10051006
#endif
10061007
#else
1007-
err |= __put_user((void *) ret_from_user_rt_signal, &frame->pretcode);
1008+
err |= __put_user((long) ret_from_user_rt_signal,
1009+
(long __user *) &frame->pretcode);
10081010
#endif /* CONFIG_MMU */
10091011

10101012
if (err)

0 commit comments

Comments
 (0)