evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sparc32: uaccess_32 macro whitespace fixes

Browse source 
Macros within arch/sparc/include/asm/uaccess_32.h are made harder to
read because they violate a bunch of coding style rules.

Fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael S. Tsirkin 2015-01-06 14:30:51 +02:00
parent 99408c840a
commit 8ccf7b2599
1 changed files with 219 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

259
arch/sparc/include/asm/uaccess_32.h
View file

@ -37,7 +37,7 @@
#define get_fs() (current->thread.current_ds) #define get_fs() (current->thread.current_ds)
#define set_fs(val) ((current->thread.current_ds) = (val)) #define set_fs(val) ((current->thread.current_ds) = (val))
#define segment_eq(a,b) ((a).seg == (b).seg) #define segment_eq(a, b) ((a).seg == (b).seg)
/* We have there a nice not-mapped page at PAGE_OFFSET - PAGE_SIZE, so that this test /* We have there a nice not-mapped page at PAGE_OFFSET - PAGE_SIZE, so that this test
* can be fairly lightweight. * can be fairly lightweight.
@ -46,7 +46,7 @@
*/ */
#define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; }) #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
#define __access_ok(addr,size) (__user_ok((addr) & get_fs().seg,(size))) #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
#define access_ok(type, addr, size) \ #define access_ok(type, addr, size) \
({ (void)(type); __access_ok((unsigned long)(addr), size); }) ({ (void)(type); __access_ok((unsigned long)(addr), size); })
@ -91,57 +91,88 @@ void __ret_efault(void);
* of a performance impact. Thus we have a few rather ugly macros here, * of a performance impact. Thus we have a few rather ugly macros here,
* and hide all the ugliness from the user. * and hide all the ugliness from the user.
*/ */
#define put_user(x,ptr) ({ \ #define put_user(x, ptr) ({ \
unsigned long __pu_addr = (unsigned long)(ptr); \ unsigned long __pu_addr = (unsigned long)(ptr); \
__chk_user_ptr(ptr); \ __chk_user_ptr(ptr); \
__put_user_check((__typeof__(*(ptr)))(x),__pu_addr,sizeof(*(ptr))); }) __put_user_check((__typeof__(*(ptr)))(x), __pu_addr, sizeof(*(ptr))); \
})
#define get_user(x,ptr) ({ \ #define get_user(x, ptr) ({ \
unsigned long __gu_addr = (unsigned long)(ptr); \ unsigned long __gu_addr = (unsigned long)(ptr); \
__chk_user_ptr(ptr); \ __chk_user_ptr(ptr); \
__get_user_check((x),__gu_addr,sizeof(*(ptr)),__typeof__(*(ptr))); }) __get_user_check((x), __gu_addr, sizeof(*(ptr)), __typeof__(*(ptr))); \
})
/* /*
* The "__xxx" versions do not do address space checking, useful when * The "__xxx" versions do not do address space checking, useful when
* doing multiple accesses to the same area (the user has to do the * doing multiple accesses to the same area (the user has to do the
* checks by hand with "access_ok()") * checks by hand with "access_ok()")
*/ */
#define __put_user(x,ptr) __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) #define __put_user(x, ptr) \
#define __get_user(x,ptr) __get_user_nocheck((x),(ptr),sizeof(*(ptr)),__typeof__(*(ptr))) __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
#define __get_user(x, ptr) \
__get_user_nocheck((x), (ptr), sizeof(*(ptr)), __typeof__(*(ptr)))
struct __large_struct { unsigned long buf[100]; }; struct __large_struct { unsigned long buf[100]; };
#define __m(x) ((struct __large_struct __user *)(x)) #define __m(x) ((struct __large_struct __user *)(x))
#define __put_user_check(x,addr,size) ({ \ #define __put_user_check(x, addr, size) ({ \
register int __pu_ret; \ register int __pu_ret; \
if (__access_ok(addr,size)) { \ if (__access_ok(addr, size)) { \
switch (size) { \ switch (size) { \
case 1: __put_user_asm(x,b,addr,__pu_ret); break; \ case 1: \
case 2: __put_user_asm(x,h,addr,__pu_ret); break; \ __put_user_asm(x, b, addr, __pu_ret); \
case 4: __put_user_asm(x,,addr,__pu_ret); break; \ break; \
case 8: __put_user_asm(x,d,addr,__pu_ret); break; \ case 2: \
default: __pu_ret = __put_user_bad(); break; \ __put_user_asm(x, h, addr, __pu_ret); \
} } else { __pu_ret = -EFAULT; } __pu_ret; }) break; \
case 4: \
__put_user_asm(x, , addr, __pu_ret); \
break; \
case 8: \
__put_user_asm(x, d, addr, __pu_ret); \
break; \
default: \
__pu_ret = __put_user_bad(); \
break; \
} \
} else { \
__pu_ret = -EFAULT; \
} \
__pu_ret; \
})
#define __put_user_nocheck(x,addr,size) ({ \ #define __put_user_nocheck(x, addr, size) ({ \
register int __pu_ret; \ register int __pu_ret; \
switch (size) { \ switch (size) { \
case 1: __put_user_asm(x,b,addr,__pu_ret); break; \ case 1: \
case 2: __put_user_asm(x,h,addr,__pu_ret); break; \ __put_user_asm(x, b, addr, __pu_ret); \
case 4: __put_user_asm(x,,addr,__pu_ret); break; \ break; \
case 8: __put_user_asm(x,d,addr,__pu_ret); break; \ case 2: \
default: __pu_ret = __put_user_bad(); break; \ __put_user_asm(x, h, addr, __pu_ret); \
} __pu_ret; }) break; \
case 4: \
__put_user_asm(x, , addr, __pu_ret); \
break; \
case 8: \
__put_user_asm(x, d, addr, __pu_ret); \
break; \
default: \
__pu_ret = __put_user_bad(); \
break; \
} \
__pu_ret; \
})
#define __put_user_asm(x,size,addr,ret) \ #define __put_user_asm(x, size, addr, ret) \
__asm__ __volatile__( \ __asm__ __volatile__( \
"/* Put user asm, inline. */\n" \ "/* Put user asm, inline. */\n" \
"1:\t" "st"#size " %1, %2\n\t" \ "1:\t" "st"#size " %1, %2\n\t" \
"clr %0\n" \ "clr %0\n" \
"2:\n\n\t" \ "2:\n\n\t" \
".section .fixup,#alloc,#execinstr\n\t" \ ".section .fixup,#alloc,#execinstr\n\t" \
".align 4\n" \ ".align 4\n" \
"3:\n\t" \ "3:\n\t" \
"b 2b\n\t" \ "b 2b\n\t" \
" mov %3, %0\n\t" \ " mov %3, %0\n\t" \
".previous\n\n\t" \ ".previous\n\n\t" \
@ -154,59 +185,117 @@ __asm__ __volatile__( \
int __put_user_bad(void); int __put_user_bad(void);
#define __get_user_check(x,addr,size,type) ({ \ #define __get_user_check(x, addr, size, type) ({ \
register int __gu_ret; \ register int __gu_ret; \
register unsigned long __gu_val; \ register unsigned long __gu_val; \
if (__access_ok(addr,size)) { \ if (__access_ok(addr, size)) { \
switch (size) { \ switch (size) { \
case 1: __get_user_asm(__gu_val,ub,addr,__gu_ret); break; \ case 1: \
case 2: __get_user_asm(__gu_val,uh,addr,__gu_ret); break; \ __get_user_asm(__gu_val, ub, addr, __gu_ret); \
case 4: __get_user_asm(__gu_val,,addr,__gu_ret); break; \ break; \
case 8: __get_user_asm(__gu_val,d,addr,__gu_ret); break; \ case 2: \
default: __gu_val = 0; __gu_ret = __get_user_bad(); break; \ __get_user_asm(__gu_val, uh, addr, __gu_ret); \
} } else { __gu_val = 0; __gu_ret = -EFAULT; } x = (__force type) __gu_val; __gu_ret; }) break; \
case 4: \
__get_user_asm(__gu_val, , addr, __gu_ret); \
break; \
case 8: \
__get_user_asm(__gu_val, d, addr, __gu_ret); \
break; \
default: \
__gu_val = 0; \
__gu_ret = __get_user_bad(); \
break; \
} \
} else { \
__gu_val = 0; \
__gu_ret = -EFAULT; \
} \
x = (__force type) __gu_val; \
__gu_ret; \
})
#define __get_user_check_ret(x,addr,size,type,retval) ({ \ #define __get_user_check_ret(x, addr, size, type, retval) ({ \
register unsigned long __gu_val __asm__ ("l1"); \ register unsigned long __gu_val __asm__ ("l1"); \
if (__access_ok(addr,size)) { \ if (__access_ok(addr, size)) { \
switch (size) { \ switch (size) { \
case 1: __get_user_asm_ret(__gu_val,ub,addr,retval); break; \ case 1: \
case 2: __get_user_asm_ret(__gu_val,uh,addr,retval); break; \ __get_user_asm_ret(__gu_val, ub, addr, retval); \
case 4: __get_user_asm_ret(__gu_val,,addr,retval); break; \ break; \
case 8: __get_user_asm_ret(__gu_val,d,addr,retval); break; \ case 2: \
default: if (__get_user_bad()) return retval; \ __get_user_asm_ret(__gu_val, uh, addr, retval); \
} x = (__force type) __gu_val; } else return retval; }) break; \
case 4: \
__get_user_asm_ret(__gu_val, , addr, retval); \
break; \
case 8: \
__get_user_asm_ret(__gu_val, d, addr, retval); \
break; \
default: \
if (__get_user_bad()) \
return retval; \
} \
x = (__force type) __gu_val; \
} else \
return retval; \
})
#define __get_user_nocheck(x,addr,size,type) ({ \ #define __get_user_nocheck(x, addr, size, type) ({ \
register int __gu_ret; \ register int __gu_ret; \
register unsigned long __gu_val; \ register unsigned long __gu_val; \
switch (size) { \ switch (size) { \
case 1: __get_user_asm(__gu_val,ub,addr,__gu_ret); break; \ case 1: \
case 2: __get_user_asm(__gu_val,uh,addr,__gu_ret); break; \ __get_user_asm(__gu_val, ub, addr, __gu_ret); \
case 4: __get_user_asm(__gu_val,,addr,__gu_ret); break; \ break; \
case 8: __get_user_asm(__gu_val,d,addr,__gu_ret); break; \ case 2: \
default: __gu_val = 0; __gu_ret = __get_user_bad(); break; \ __get_user_asm(__gu_val, uh, addr, __gu_ret); \
} x = (__force type) __gu_val; __gu_ret; }) break; \
case 4: \
__get_user_asm(__gu_val, , addr, __gu_ret); \
break; \
case 8: \
__get_user_asm(__gu_val, d, addr, __gu_ret); \
break; \
default: \
__gu_val = 0; \
__gu_ret = __get_user_bad(); \
break; \
} \
x = (__force type) __gu_val; \
__gu_ret; \
})
#define __get_user_nocheck_ret(x,addr,size,type,retval) ({ \ #define __get_user_nocheck_ret(x, addr, size, type, retval) ({ \
register unsigned long __gu_val __asm__ ("l1"); \ register unsigned long __gu_val __asm__ ("l1"); \
switch (size) { \ switch (size) { \
case 1: __get_user_asm_ret(__gu_val,ub,addr,retval); break; \ case 1: \
case 2: __get_user_asm_ret(__gu_val,uh,addr,retval); break; \ __get_user_asm_ret(__gu_val, ub, addr, retval); \
case 4: __get_user_asm_ret(__gu_val,,addr,retval); break; \ break; \
case 8: __get_user_asm_ret(__gu_val,d,addr,retval); break; \ case 2: \
default: if (__get_user_bad()) return retval; \ __get_user_asm_ret(__gu_val, uh, addr, retval); \
} x = (__force type) __gu_val; }) break; \
case 4: \
__get_user_asm_ret(__gu_val, , addr, retval); \
break; \
case 8: \
__get_user_asm_ret(__gu_val, d, addr, retval); \
break; \
default: \
if (__get_user_bad()) \
return retval; \
} \
x = (__force type) __gu_val; \
})
#define __get_user_asm(x,size,addr,ret) \ #define __get_user_asm(x, size, addr, ret) \
__asm__ __volatile__( \ __asm__ __volatile__( \
"/* Get user asm, inline. */\n" \ "/* Get user asm, inline. */\n" \
"1:\t" "ld"#size " %2, %1\n\t" \ "1:\t" "ld"#size " %2, %1\n\t" \
"clr %0\n" \ "clr %0\n" \
"2:\n\n\t" \ "2:\n\n\t" \
".section .fixup,#alloc,#execinstr\n\t" \ ".section .fixup,#alloc,#execinstr\n\t" \
".align 4\n" \ ".align 4\n" \
"3:\n\t" \ "3:\n\t" \
"clr %1\n\t" \ "clr %1\n\t" \
"b 2b\n\t" \ "b 2b\n\t" \
" mov %3, %0\n\n\t" \ " mov %3, %0\n\n\t" \
@ -218,23 +307,23 @@ __asm__ __volatile__( \
: "=&r" (ret), "=&r" (x) : "m" (*__m(addr)), \ : "=&r" (ret), "=&r" (x) : "m" (*__m(addr)), \
"i" (-EFAULT)) "i" (-EFAULT))
#define __get_user_asm_ret(x,size,addr,retval) \ #define __get_user_asm_ret(x, size, addr, retval) \
if (__builtin_constant_p(retval) && retval == -EFAULT) \ if (__builtin_constant_p(retval) && retval == -EFAULT) \
__asm__ __volatile__( \ __asm__ __volatile__( \
"/* Get user asm ret, inline. */\n" \ "/* Get user asm ret, inline. */\n" \
"1:\t" "ld"#size " %1, %0\n\n\t" \ "1:\t" "ld"#size " %1, %0\n\n\t" \
".section __ex_table,#alloc\n\t" \ ".section __ex_table,#alloc\n\t" \
".align 4\n\t" \ ".align 4\n\t" \
".word 1b,__ret_efault\n\n\t" \ ".word 1b,__ret_efault\n\n\t" \
".previous\n\t" \ ".previous\n\t" \
: "=&r" (x) : "m" (*__m(addr))); \ : "=&r" (x) : "m" (*__m(addr))); \
else \ else \
__asm__ __volatile__( \ __asm__ __volatile__( \
"/* Get user asm ret, inline. */\n" \ "/* Get user asm ret, inline. */\n" \
"1:\t" "ld"#size " %1, %0\n\n\t" \ "1:\t" "ld"#size " %1, %0\n\n\t" \
".section .fixup,#alloc,#execinstr\n\t" \ ".section .fixup,#alloc,#execinstr\n\t" \
".align 4\n" \ ".align 4\n" \
"3:\n\t" \ "3:\n\t" \
"ret\n\t" \ "ret\n\t" \
" restore %%g0, %2, %%o0\n\n\t" \ " restore %%g0, %2, %%o0\n\n\t" \
".previous\n\t" \ ".previous\n\t" \