UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

alpha: get rid of 'segment' argument of __{get,put}_user_check() 

always equal to get_fs()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-12-27 02:04:09 -05:00
parent b5478c1b67
commit d78d834bed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/alpha/include/asm/uaccess.h
View File

@ -54,9 +54,9 @@
* (b) require any knowledge of processes at this stage * (b) require any knowledge of processes at this stage
*/ */
#define put_user(x, ptr) \ #define put_user(x, ptr) \
__put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), get_fs()) __put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
#define get_user(x, ptr) \ #define get_user(x, ptr) \
__get_user_check((x), (ptr), sizeof(*(ptr)), get_fs()) __get_user_check((x), (ptr), sizeof(*(ptr)))
/* /*
* The "__xxx" versions do not do address space checking, useful when * The "__xxx" versions do not do address space checking, useful when
@ -93,12 +93,12 @@ extern void __get_user_unknown(void);
__gu_err; \ __gu_err; \
}) })
#define __get_user_check(x, ptr, size, segment) \ #define __get_user_check(x, ptr, size) \
({ \ ({ \
long __gu_err = -EFAULT; \ long __gu_err = -EFAULT; \
unsigned long __gu_val = 0; \ unsigned long __gu_val = 0; \
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
if (__access_ok((unsigned long)__gu_addr, size, segment)) { \ if (__access_ok((unsigned long)__gu_addr, size, get_fs())) { \
__gu_err = 0; \ __gu_err = 0; \
switch (size) { \ switch (size) { \
case 1: __get_user_8(__gu_addr); break; \ case 1: __get_user_8(__gu_addr); break; \
@ -208,11 +208,11 @@ extern void __put_user_unknown(void);
__pu_err; \ __pu_err; \
}) })
#define __put_user_check(x, ptr, size, segment) \ #define __put_user_check(x, ptr, size) \
({ \ ({ \
long __pu_err = -EFAULT; \ long __pu_err = -EFAULT; \
__typeof__(*(ptr)) __user *__pu_addr = (ptr); \ __typeof__(*(ptr)) __user *__pu_addr = (ptr); \
if (__access_ok((unsigned long)__pu_addr, size, segment)) { \ if (__access_ok((unsigned long)__pu_addr, size, get_fs())) { \
__pu_err = 0; \ __pu_err = 0; \
switch (size) { \ switch (size) { \
case 1: __put_user_8(x, __pu_addr); break; \ case 1: __put_user_8(x, __pu_addr); break; \