openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

CRIS: Whitespace cleanup 

No functional change, just clean up the most obvious.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Jesper Nilsson 2015-02-09 13:02:38 +01:00
parent 83f1588e9f
commit 9987c19ed9
1 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
arch/cris/include/asm/uaccess.h
View File

@ -1,4 +1,4 @@
/* /*
* Authors: Bjorn Wesen (bjornw@axis.com) * Authors: Bjorn Wesen (bjornw@axis.com)
* Hans-Peter Nilsson (hp@axis.com) * Hans-Peter Nilsson (hp@axis.com)
*/ */
@ -35,7 +35,7 @@
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
/* addr_limit is the maximum accessible address for the task. we misuse /* addr_limit is the maximum accessible address for the task. we misuse
* the KERNEL_DS and USER_DS values to both assign and compare the * the KERNEL_DS and USER_DS values to both assign and compare the
* addr_limit values through the equally misnamed get/set_fs macros. * addr_limit values through the equally misnamed get/set_fs macros.
* (see above) * (see above)
*/ */
@ -51,7 +51,7 @@
#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
#define __user_ok(addr, size) \ #define __user_ok(addr, size) \
(((size) <= TASK_SIZE)&&((addr) <= TASK_SIZE-(size))) (((size) <= TASK_SIZE) && ((addr) <= TASK_SIZE-(size)))
#define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size))) #define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size)))
#define access_ok(type, addr, size) __access_ok((unsigned long)(addr), (size)) #define access_ok(type, addr, size) __access_ok((unsigned long)(addr), (size))
@ -70,8 +70,7 @@
* on our cache or tlb entries. * on our cache or tlb entries.
*/ */
struct exception_table_entry struct exception_table_entry {
{
unsigned long insn, fixup; unsigned long insn, fixup;
}; };
@ -94,14 +93,14 @@ struct exception_table_entry
* exception handling means that it's no longer "just"...) * exception handling means that it's no longer "just"...)
*/ */
#define get_user(x, ptr) \ #define get_user(x, ptr) \
__get_user_check((x), (ptr), sizeof(*(ptr))) __get_user_check((x), (ptr), sizeof(*(ptr)))
#define put_user(x, ptr) \ #define put_user(x, ptr) \
__put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) __put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
#define __get_user(x, ptr) \ #define __get_user(x, ptr) \
__get_user_nocheck((x), (ptr), sizeof(*(ptr))) __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
#define __put_user(x, ptr) \ #define __put_user(x, ptr) \
__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
extern long __put_user_bad(void); extern long __put_user_bad(void);
@ -109,11 +108,20 @@ extern long __put_user_bad(void);
do { \ do { \
retval = 0; \ retval = 0; \
switch (size) { \ switch (size) { \
case 1: __put_user_asm(x, ptr, retval, "move.b"); break; \ case 1: \
case 2: __put_user_asm(x, ptr, retval, "move.w"); break; \ __put_user_asm(x, ptr, retval, "move.b"); \
case 4: __put_user_asm(x, ptr, retval, "move.d"); break; \ break; \
case 8: __put_user_asm_64(x, ptr, retval); break; \ case 2: \
default: __put_user_bad(); \ __put_user_asm(x, ptr, retval, "move.w"); \
break; \
case 4: \
__put_user_asm(x, ptr, retval, "move.d"); \
break; \
case 8: \
__put_user_asm_64(x, ptr, retval); \
break; \
default: \
__put_user_bad(); \
} \ } \
} while (0) } while (0)
@ -121,11 +129,20 @@ do { \
do { \ do { \
retval = 0; \ retval = 0; \
switch (size) { \ switch (size) { \
case 1: __get_user_asm(x, ptr, retval, "move.b"); break; \ case 1: \
case 2: __get_user_asm(x, ptr, retval, "move.w"); break; \ __get_user_asm(x, ptr, retval, "move.b"); \
case 4: __get_user_asm(x, ptr, retval, "move.d"); break; \ break; \
case 8: __get_user_asm_64(x, ptr, retval); break; \ case 2: \
default: (x) = __get_user_bad(); \ __get_user_asm(x, ptr, retval, "move.w"); \
break; \
case 4: \
__get_user_asm(x, ptr, retval, "move.d"); \
break; \
case 8: \
__get_user_asm_64(x, ptr, retval); \
break; \
default: \
(x) = __get_user_bad(); \
} \ } \
} while (0) } while (0)
@ -211,6 +228,7 @@ static inline long
strncpy_from_user(char *dst, const char __user *src, long count) strncpy_from_user(char *dst, const char __user *src, long count)
{ {
long res = -EFAULT; long res = -EFAULT;
if (access_ok(VERIFY_READ, src, 1)) if (access_ok(VERIFY_READ, src, 1))
res = __do_strncpy_from_user(dst, src, count); res = __do_strncpy_from_user(dst, src, count);
return res; return res;
@ -224,6 +242,7 @@ static inline unsigned long
__constant_copy_from_user(void *to, const void __user *from, unsigned long n) __constant_copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (n == 0) if (n == 0)
; ;
else if (n == 1) else if (n == 1)
@ -274,6 +293,7 @@ static inline unsigned long
__constant_copy_to_user(void __user *to, const void *from, unsigned long n) __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (n == 0) if (n == 0)
; ;
else if (n == 1) else if (n == 1)
@ -324,6 +344,7 @@ static inline unsigned long
__constant_clear_user(void __user *to, unsigned long n) __constant_clear_user(void __user *to, unsigned long n)
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (n == 0) if (n == 0)
; ;
else if (n == 1) else if (n == 1)
@ -351,20 +372,20 @@ __constant_clear_user(void __user *to, unsigned long n)
} }
#define clear_user(to, n) \ #define clear_user(to, n) \
(__builtin_constant_p(n) ? \ (__builtin_constant_p(n) ? \
__constant_clear_user(to, n) : \ __constant_clear_user(to, n) : \
__generic_clear_user(to, n)) __generic_clear_user(to, n))
#define copy_from_user(to, from, n) \ #define copy_from_user(to, from, n) \
(__builtin_constant_p(n) ? \ (__builtin_constant_p(n) ? \
__constant_copy_from_user(to, from, n) : \ __constant_copy_from_user(to, from, n) : \
__generic_copy_from_user(to, from, n)) __generic_copy_from_user(to, from, n))
#define copy_to_user(to, from, n) \ #define copy_to_user(to, from, n) \
(__builtin_constant_p(n) ? \ (__builtin_constant_p(n) ? \
__constant_copy_to_user(to, from, n) : \ __constant_copy_to_user(to, from, n) : \
__generic_copy_to_user(to, from, n)) __generic_copy_to_user(to, from, n))
/* We let the __ versions of copy_from/to_user inline, because they're often /* We let the __ versions of copy_from/to_user inline, because they're often
* used in fast paths and have only a small space overhead. * used in fast paths and have only a small space overhead.