diff options
| author |   Greg Ungerer <gerg@linux-m68k.org> | 2020-09-15 15:16:49 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2020-10-05 21:51:31 +1000 |
| commit | 006967471c8b6ba382afc65222e25a283449a3e8 (patch) | |
| tree | c07fdc2b66d320d0b8e2b35467d96a8012d8343c | |
| parent | m68knommu: switch to using asm-generic/uaccess.h (diff) | |
| download | linux-dev-006967471c8b6ba382afc65222e25a283449a3e8.tar.xz linux-dev-006967471c8b6ba382afc65222e25a283449a3e8.zip | |
m68knommu: fix sparse warnings in signal code
Commit 858b810bf63f ("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 <lkp@intel.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
| -rw-r--r-- | arch/m68k/kernel/signal.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index a98fca977073..a85f59bc1c35 100644 --- 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) |