diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-14 11:37:49 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-14 11:37:49 -0800 |
commit | 24318ae80d1705acc50f0d70ece543345336a6e1 (patch) | |
tree | b71312189eb402762951a04e9f4181940c35c3a8 /arch/sh/mm | |
parent | 6ea45c57dc176dde529ab5d7c4b3f20e52a2bd82 (diff) | |
parent | 8518e694203d0bfd202ea4a80356785b6992322e (diff) | |
download | linux-24318ae80d1705acc50f0d70ece543345336a6e1.tar.bz2 |
Merge tag 'sh-for-5.16' of git://git.libc.org/linux-sh
Pull arch/sh updates from Rich Felker.
* tag 'sh-for-5.16' of git://git.libc.org/linux-sh:
sh: pgtable-3level: Fix cast to pointer from integer of different size
sh: fix READ/WRITE redefinition warnings
sh: define __BIG_ENDIAN for math-emu
sh: math-emu: drop unused functions
sh: fix kconfig unmet dependency warning for FRAME_POINTER
sh: Cleanup about SPARSE_IRQ
sh: kdump: add some attribute to function
maple: fix wrong return value of maple_bus_init().
sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/
sh: boot: add intermediate vmlinux.bin* to targets instead of extra-y
sh: boards: Fix the cacography in irq.c
sh: check return code of request_irq
sh: fix trivial misannotations
Diffstat (limited to 'arch/sh/mm')
-rw-r--r-- | arch/sh/mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/nommu.c b/arch/sh/mm/nommu.c index 8b4504413c5f..78c4b6e6d33b 100644 --- a/arch/sh/mm/nommu.c +++ b/arch/sh/mm/nommu.c @@ -28,9 +28,9 @@ __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n) return 0; } -__kernel_size_t __clear_user(void *to, __kernel_size_t n) +__kernel_size_t __clear_user(void __user *to, __kernel_size_t n) { - memset(to, 0, n); + memset((__force void *)to, 0, n); return 0; } |