Skip to content

Commit cb2ccea

Browse files
jpoimboeJiri Kosina
authored andcommitted
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: [email protected] Cc: [email protected] Signed-off-by: Josh Poimboeuf <[email protected]> Acked-by: Joe Lawrence <[email protected]> Acked-by: Miroslav Benes <[email protected]> Acked-by: Gerald Schaefer <[email protected]> # s390 Signed-off-by: Jiri Kosina <[email protected]>
1 parent ca376a9 commit cb2ccea

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

arch/s390/include/asm/uaccess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,6 @@ static inline unsigned long __must_check clear_user(void __user *to, unsigned lo
276276
}
277277

278278
int copy_to_user_real(void __user *dest, void *src, unsigned long count);
279-
void s390_kernel_write(void *dst, const void *src, size_t size);
279+
void *s390_kernel_write(void *dst, const void *src, size_t size);
280280

281281
#endif /* __S390_UACCESS_H */

arch/s390/mm/maccess.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,22 @@ static notrace long s390_kernel_write_odd(void *dst, const void *src, size_t siz
5555
*/
5656
static DEFINE_SPINLOCK(s390_kernel_write_lock);
5757

58-
void notrace s390_kernel_write(void *dst, const void *src, size_t size)
58+
notrace void *s390_kernel_write(void *dst, const void *src, size_t size)
5959
{
60+
void *tmp = dst;
6061
unsigned long flags;
6162
long copied;
6263

6364
spin_lock_irqsave(&s390_kernel_write_lock, flags);
6465
while (size) {
65-
copied = s390_kernel_write_odd(dst, src, size);
66-
dst += copied;
66+
copied = s390_kernel_write_odd(tmp, src, size);
67+
tmp += copied;
6768
src += copied;
6869
size -= copied;
6970
}
7071
spin_unlock_irqrestore(&s390_kernel_write_lock, flags);
72+
73+
return dst;
7174
}
7275

7376
static int __no_sanitize_address __memcpy_real(void *dest, void *src, size_t count)

0 commit comments

Comments
 (0)