x86: uaccess: fix style problems
PATCH 1/2 x86: uaccess: fix style problems
From: Hiroshi Shimamoto <[email protected]>
Impact: cleanup
fix some coding style problems in arch/x86/include/asm/uaccess.h.
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/include/asm/uaccess.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/uaccess.h +3 -3
@@ -121,7 +121,7 @@ extern int __get_user_bad(void);#define __get_user_x (size, ret, x, ptr) \ asm volatile("call __get_user_" #size \ - : "=a" (ret),"=d" (x) \ + : "=a" (ret), "=d" (x) \ : "0" (ptr)) \/* Careful: we have to cast the result to the type of the pointer
@@ -181,7 +181,7 @@ extern int __get_user_bad(void);#define __put_user_x (size, x, ptr, __ret_pu) \ asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ - :"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") + : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
@@ -276,7 +276,7 @@ do { \__put_user_asm (x, ptr, retval,"w" ,"w" ,"ir" , errret); \break ; \case 4 : \ -__put_user_asm (x, ptr, retval,"l" ,"k" ,"ir" , errret);\ +__put_user_asm (x, ptr, retval,"l" ,"k" ,"ir" , errret); \break ; \case 8 : \__put_user_u64 ((__typeof__ (*ptr))(x), ptr, retval); \
Signature · 1 line
1.6.0.4
PATCH 2/2 x86: uaccess: rename __put_user_u64() to __put_user_asm_u64()
From: Hiroshi Shimamoto <[email protected]>
Impact: cleanup
rename __put_user_u64() to __put_user_asm_u64() like __get_user_asm_u64().
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/include/asm/uaccess.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/uaccess.h +3 -3
@@ -186,7 +186,7 @@ extern int __get_user_bad(void);#ifdef CONFIG_X86_32 -#define __put_user_u64 (x, addr, err) \ +#define __put_user_asm_u64 (x, addr, err) \ asm volatile("1: movl %%eax,0(%2)\n" \ "2: movl %%edx,4(%2)\n" \ "3:\n" \
@@ -203,7 +203,7 @@ extern int __get_user_bad(void); asmvolatile ("call __put_user_8" :"=a" (__ret_pu) \ : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")#else -#define __put_user_u64 (x, ptr, retval) \ +#define __put_user_asm_u64 (x, ptr, retval) \ __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT)#define __put_user_x8 (x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu)#endif
@@ -279,7 +279,7 @@ do { \__put_user_asm (x, ptr, retval,"l" ,"k" ,"ir" , errret); \break ; \case 8 : \ -__put_user_u64 ((__typeof__ (*ptr))(x), ptr, retval); \ +__put_user_asm_u64 ((__typeof__ (*ptr))(x), ptr, retval); \break ; \default : \__put_user_bad (); \
Signature · 1 line
1.6.0.4
Re: [PATCH 2/2] x86: uaccess: rename __put_user_u64() to __put_user_asm_u64()
Quoted 7 lines · Hiroshi Shimamoto
From: Hiroshi Shimamoto <[email protected]>
Impact: cleanup
rename
__put_user_u64()to__put_user_asm_u64()like__get_user_asm_u64().Signed-off-by Hiroshi Shimamoto <[email protected]>
Applied your cleanups to tip/x86/cleanups, thanks!
Ingo