[PATCH 4/7] m68k: remove the err argument to the get_user/put_user assembly helpers

Christoph Hellwig
2021-07-09T07:02:12Z

These are always hardwired to -EFAULT now.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/m68k/include/asm/uaccess.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/m68k/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess.h
index 96aae4d4656b..fa466bf6c4ca 100644
--- a/arch/m68k/include/asm/uaccess.h
+++ b/arch/m68k/include/asm/uaccess.h
@@ -39,7 +39,7 @@ static inline int access_ok(const void __user *addr,
#define MOVES "move"
#endif

-#define __put_user_asm(res, x, ptr, bwl, reg, err) \
+#define __put_user_asm(res, x, ptr, bwl, reg) \
asm volatile ("\n" \
"1: "MOVES"."#bwl" %2,%1\n" \
"2:\n" \
@@ -55,7 +55,7 @@ asm volatile ("\n" \
" .long 2b,10b\n" \
" .previous" \
: "+d" (res), "=m" (*(ptr)) \
- : #reg (x), "i" (err))
+ : #reg (x), "i" (-EFAULT))

/*
* These are the main single-value transfer routines. They automatically
@@ -69,13 +69,13 @@ asm volatile ("\n" \
__chk_user_ptr(ptr); \
switch (sizeof (*(ptr))) { \
case 1: \
- __put_user_asm(__pu_err, __pu_val, ptr, b, d, -EFAULT); \
+ __put_user_asm(__pu_err, __pu_val, ptr, b, d); \
break; \
case 2: \
- __put_user_asm(__pu_err, __pu_val, ptr, w, r, -EFAULT); \
+ __put_user_asm(__pu_err, __pu_val, ptr, w, r); \
break; \
case 4: \
- __put_user_asm(__pu_err, __pu_val, ptr, l, r, -EFAULT); \
+ __put_user_asm(__pu_err, __pu_val, ptr, l, r); \
break; \
case 8: \
{ \
@@ -109,7 +109,7 @@ asm volatile ("\n" \
#define put_user(x, ptr) __put_user(x, ptr)

-#define __get_user_asm(res, x, ptr, type, bwl, reg, err) ({ \
+#define __get_user_asm(res, x, ptr, type, bwl, reg) ({ \
type __gu_val; \
asm volatile ("\n" \
"1: "MOVES"."#bwl" %2,%1\n" \
@@ -126,7 +126,7 @@ asm volatile ("\n" \
" .long 1b,10b\n" \
" .previous" \
: "+d" (res), "=&" #reg (__gu_val) \
- : "m" (*(ptr)), "i" (err)); \
+ : "m" (*(ptr)), "i" (-EFAULT)); \
(x) = (__force typeof(*(ptr)))(__force unsigned long)__gu_val; \
})

@@ -136,13 +136,13 @@ asm volatile ("\n" \
__chk_user_ptr(ptr); \
switch (sizeof(*(ptr))) { \
case 1: \
- __get_user_asm(__gu_err, x, ptr, u8, b, d, -EFAULT); \
+ __get_user_asm(__gu_err, x, ptr, u8, b, d); \
break; \
case 2: \
- __get_user_asm(__gu_err, x, ptr, u16, w, r, -EFAULT); \
+ __get_user_asm(__gu_err, x, ptr, u16, w, r); \
break; \
case 4: \
- __get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \
+ __get_user_asm(__gu_err, x, ptr, u32, l, r); \
break; \
case 8: { \
const void __user *__gu_ptr = (ptr); \
--
2.30.2