diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2020-04-29 17:24:47 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-05-08 00:12:43 +0200 |
| commit | cb2cceaefb4c4dc28fc27ff1f1b2d258bfc10353 (patch) | |
| tree | b2bdd9f05539a83ab5c7e63d334386650d0916ca /arch/s390/mm/maccess.c | |
| parent | livepatch: Prevent module-specific KLP rela sections from referencing vmlinux... (diff) | |
| download | linux-cb2cceaefb4c4dc28fc27ff1f1b2d258bfc10353.tar.xz linux-cb2cceaefb4c4dc28fc27ff1f1b2d258bfc10353.zip | |
s390: Change s390_kernel_write() return type to match memcpy()
s390_kernel_write()'s function type is almost identical to memcpy().
Change its return type to "void *" so they can be used interchangeably.
Cc: linux-s390@vger.kernel.org
Cc: heiko.carstens@de.ibm.com
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
Acked-by: Miroslav Benes <mbenes@suse.cz>
Acked-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> # s390
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/s390/mm/maccess.c')
| -rw-r--r-- | arch/s390/mm/maccess.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c index de7ca4b6718f..22a0be655f27 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c @@ -55,19 +55,22 @@ static notrace long s390_kernel_write_odd(void *dst, const void *src, size_t siz */ static DEFINE_SPINLOCK(s390_kernel_write_lock); -void notrace s390_kernel_write(void *dst, const void *src, size_t size) +notrace void *s390_kernel_write(void *dst, const void *src, size_t size) { + void *tmp = dst; unsigned long flags; long copied; spin_lock_irqsave(&s390_kernel_write_lock, flags); while (size) { - copied = s390_kernel_write_odd(dst, src, size); - dst += copied; + copied = s390_kernel_write_odd(tmp, src, size); + tmp += copied; src += copied; size -= copied; } spin_unlock_irqrestore(&s390_kernel_write_lock, flags); + + return dst; } static int __no_sanitize_address __memcpy_real(void *dest, void *src, size_t count) |