diff options
| -rw-r--r-- | arch/m32r/include/asm/uaccess.h | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/arch/m32r/include/asm/uaccess.h b/arch/m32r/include/asm/uaccess.h index d076942a7b2b..71adff209405 100644 --- a/arch/m32r/include/asm/uaccess.h +++ b/arch/m32r/include/asm/uaccess.h | |||
| @@ -54,7 +54,7 @@ static inline void set_fs(mm_segment_t s) | |||
| 54 | 54 | ||
| 55 | #endif /* not CONFIG_MMU */ | 55 | #endif /* not CONFIG_MMU */ |
| 56 | 56 | ||
| 57 | #define segment_eq(a,b) ((a).seg == (b).seg) | 57 | #define segment_eq(a, b) ((a).seg == (b).seg) |
| 58 | 58 | ||
| 59 | #define __addr_ok(addr) \ | 59 | #define __addr_ok(addr) \ |
| 60 | ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg)) | 60 | ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg)) |
| @@ -68,7 +68,7 @@ static inline void set_fs(mm_segment_t s) | |||
| 68 | * | 68 | * |
| 69 | * This needs 33-bit arithmetic. We have a carry... | 69 | * This needs 33-bit arithmetic. We have a carry... |
| 70 | */ | 70 | */ |
| 71 | #define __range_ok(addr,size) ({ \ | 71 | #define __range_ok(addr, size) ({ \ |
| 72 | unsigned long flag, roksum; \ | 72 | unsigned long flag, roksum; \ |
| 73 | __chk_user_ptr(addr); \ | 73 | __chk_user_ptr(addr); \ |
| 74 | asm ( \ | 74 | asm ( \ |
| @@ -103,7 +103,7 @@ static inline void set_fs(mm_segment_t s) | |||
| 103 | * this function, memory access functions may still return -EFAULT. | 103 | * this function, memory access functions may still return -EFAULT. |
| 104 | */ | 104 | */ |
| 105 | #ifdef CONFIG_MMU | 105 | #ifdef CONFIG_MMU |
| 106 | #define access_ok(type,addr,size) (likely(__range_ok(addr,size) == 0)) | 106 | #define access_ok(type, addr, size) (likely(__range_ok(addr, size) == 0)) |
| 107 | #else | 107 | #else |
| 108 | static inline int access_ok(int type, const void *addr, unsigned long size) | 108 | static inline int access_ok(int type, const void *addr, unsigned long size) |
| 109 | { | 109 | { |
| @@ -167,8 +167,8 @@ extern int fixup_exception(struct pt_regs *regs); | |||
| 167 | * Returns zero on success, or -EFAULT on error. | 167 | * Returns zero on success, or -EFAULT on error. |
| 168 | * On error, the variable @x is set to zero. | 168 | * On error, the variable @x is set to zero. |
| 169 | */ | 169 | */ |
| 170 | #define get_user(x,ptr) \ | 170 | #define get_user(x, ptr) \ |
| 171 | __get_user_check((x),(ptr),sizeof(*(ptr))) | 171 | __get_user_check((x), (ptr), sizeof(*(ptr))) |
| 172 | 172 | ||
| 173 | /** | 173 | /** |
| 174 | * put_user: - Write a simple value into user space. | 174 | * put_user: - Write a simple value into user space. |
| @@ -186,8 +186,8 @@ extern int fixup_exception(struct pt_regs *regs); | |||
| 186 | * | 186 | * |
| 187 | * Returns zero on success, or -EFAULT on error. | 187 | * Returns zero on success, or -EFAULT on error. |
| 188 | */ | 188 | */ |
| 189 | #define put_user(x,ptr) \ | 189 | #define put_user(x, ptr) \ |
| 190 | __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) | 190 | __put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) |
| 191 | 191 | ||
| 192 | /** | 192 | /** |
| 193 | * __get_user: - Get a simple variable from user space, with less checking. | 193 | * __get_user: - Get a simple variable from user space, with less checking. |
| @@ -209,41 +209,41 @@ extern int fixup_exception(struct pt_regs *regs); | |||
| 209 | * Returns zero on success, or -EFAULT on error. | 209 | * Returns zero on success, or -EFAULT on error. |
| 210 | * On error, the variable @x is set to zero. | 210 | * On error, the variable @x is set to zero. |
| 211 | */ | 211 | */ |
| 212 | #define __get_user(x,ptr) \ | 212 | #define __get_user(x, ptr) \ |
| 213 | __get_user_nocheck((x),(ptr),sizeof(*(ptr))) | 213 | __get_user_nocheck((x), (ptr), sizeof(*(ptr))) |
| 214 | 214 | ||
| 215 | #define __get_user_nocheck(x,ptr,size) \ | 215 | #define __get_user_nocheck(x, ptr, size) \ |
| 216 | ({ \ | 216 | ({ \ |
| 217 | long __gu_err = 0; \ | 217 | long __gu_err = 0; \ |
| 218 | unsigned long __gu_val; \ | 218 | unsigned long __gu_val; \ |
| 219 | might_fault(); \ | 219 | might_fault(); \ |
| 220 | __get_user_size(__gu_val,(ptr),(size),__gu_err); \ | 220 | __get_user_size(__gu_val, (ptr), (size), __gu_err); \ |
| 221 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ | 221 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
| 222 | __gu_err; \ | 222 | __gu_err; \ |
| 223 | }) | 223 | }) |
| 224 | 224 | ||
| 225 | #define __get_user_check(x,ptr,size) \ | 225 | #define __get_user_check(x, ptr, size) \ |
| 226 | ({ \ | 226 | ({ \ |
| 227 | long __gu_err = -EFAULT; \ | 227 | long __gu_err = -EFAULT; \ |
| 228 | unsigned long __gu_val = 0; \ | 228 | unsigned long __gu_val = 0; \ |
| 229 | const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ | 229 | const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ |
| 230 | might_fault(); \ | 230 | might_fault(); \ |
| 231 | if (access_ok(VERIFY_READ,__gu_addr,size)) \ | 231 | if (access_ok(VERIFY_READ, __gu_addr, size)) \ |
| 232 | __get_user_size(__gu_val,__gu_addr,(size),__gu_err); \ | 232 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ |
| 233 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ | 233 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
| 234 | __gu_err; \ | 234 | __gu_err; \ |
| 235 | }) | 235 | }) |
| 236 | 236 | ||
| 237 | extern long __get_user_bad(void); | 237 | extern long __get_user_bad(void); |
| 238 | 238 | ||
| 239 | #define __get_user_size(x,ptr,size,retval) \ | 239 | #define __get_user_size(x, ptr, size, retval) \ |
| 240 | do { \ | 240 | do { \ |
| 241 | retval = 0; \ | 241 | retval = 0; \ |
| 242 | __chk_user_ptr(ptr); \ | 242 | __chk_user_ptr(ptr); \ |
| 243 | switch (size) { \ | 243 | switch (size) { \ |
| 244 | case 1: __get_user_asm(x,ptr,retval,"ub"); break; \ | 244 | case 1: __get_user_asm(x, ptr, retval, "ub"); break; \ |
| 245 | case 2: __get_user_asm(x,ptr,retval,"uh"); break; \ | 245 | case 2: __get_user_asm(x, ptr, retval, "uh"); break; \ |
| 246 | case 4: __get_user_asm(x,ptr,retval,""); break; \ | 246 | case 4: __get_user_asm(x, ptr, retval, ""); break; \ |
| 247 | default: (x) = __get_user_bad(); \ | 247 | default: (x) = __get_user_bad(); \ |
| 248 | } \ | 248 | } \ |
| 249 | } while (0) | 249 | } while (0) |
| @@ -288,26 +288,26 @@ do { \ | |||
| 288 | * | 288 | * |
| 289 | * Returns zero on success, or -EFAULT on error. | 289 | * Returns zero on success, or -EFAULT on error. |
| 290 | */ | 290 | */ |
| 291 | #define __put_user(x,ptr) \ | 291 | #define __put_user(x, ptr) \ |
| 292 | __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) | 292 | __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) |
| 293 | 293 | ||
| 294 | 294 | ||
| 295 | #define __put_user_nocheck(x,ptr,size) \ | 295 | #define __put_user_nocheck(x, ptr, size) \ |
| 296 | ({ \ | 296 | ({ \ |
| 297 | long __pu_err; \ | 297 | long __pu_err; \ |
| 298 | might_fault(); \ | 298 | might_fault(); \ |
| 299 | __put_user_size((x),(ptr),(size),__pu_err); \ | 299 | __put_user_size((x), (ptr), (size), __pu_err); \ |
| 300 | __pu_err; \ | 300 | __pu_err; \ |
| 301 | }) | 301 | }) |
| 302 | 302 | ||
| 303 | 303 | ||
| 304 | #define __put_user_check(x,ptr,size) \ | 304 | #define __put_user_check(x, ptr, size) \ |
| 305 | ({ \ | 305 | ({ \ |
| 306 | long __pu_err = -EFAULT; \ | 306 | long __pu_err = -EFAULT; \ |
| 307 | __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ | 307 | __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ |
| 308 | might_fault(); \ | 308 | might_fault(); \ |
| 309 | if (access_ok(VERIFY_WRITE,__pu_addr,size)) \ | 309 | if (access_ok(VERIFY_WRITE, __pu_addr, size)) \ |
| 310 | __put_user_size((x),__pu_addr,(size),__pu_err); \ | 310 | __put_user_size((x), __pu_addr, (size), __pu_err); \ |
| 311 | __pu_err; \ | 311 | __pu_err; \ |
| 312 | }) | 312 | }) |
| 313 | 313 | ||
| @@ -366,15 +366,15 @@ do { \ | |||
| 366 | 366 | ||
| 367 | extern void __put_user_bad(void); | 367 | extern void __put_user_bad(void); |
| 368 | 368 | ||
| 369 | #define __put_user_size(x,ptr,size,retval) \ | 369 | #define __put_user_size(x, ptr, size, retval) \ |
| 370 | do { \ | 370 | do { \ |
| 371 | retval = 0; \ | 371 | retval = 0; \ |
| 372 | __chk_user_ptr(ptr); \ | 372 | __chk_user_ptr(ptr); \ |
| 373 | switch (size) { \ | 373 | switch (size) { |
