summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-12-27 02:04:09 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-28 18:23:17 -0400
commitd78d834bed81bf838281270c7ae3790c88fc95aa (patch)
tree089b356df2911a151e031155d683a706e65b9303 /arch/alpha
parentb5478c1b67bcd52d3b7fb276090b985b4b38a7ea (diff)
downloadlinux-stable-d78d834bed81bf838281270c7ae3790c88fc95aa.tar.gz
linux-stable-d78d834bed81bf838281270c7ae3790c88fc95aa.tar.bz2
linux-stable-d78d834bed81bf838281270c7ae3790c88fc95aa.zip
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>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/include/asm/uaccess.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/alpha/include/asm/uaccess.h b/arch/alpha/include/asm/uaccess.h
index b7270a64fe1c..30fa8843e177 100644
--- a/arch/alpha/include/asm/uaccess.h
+++ b/arch/alpha/include/asm/uaccess.h
@@ -54,9 +54,9 @@
* (b) require any knowledge of processes at this stage
*/
#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) \
- __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
@@ -93,12 +93,12 @@ extern void __get_user_unknown(void);
__gu_err; \
})
-#define __get_user_check(x, ptr, size, segment) \
+#define __get_user_check(x, ptr, size) \
({ \
long __gu_err = -EFAULT; \
unsigned long __gu_val = 0; \
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; \
switch (size) { \
case 1: __get_user_8(__gu_addr); break; \
@@ -208,11 +208,11 @@ extern void __put_user_unknown(void);
__pu_err; \
})
-#define __put_user_check(x, ptr, size, segment) \
+#define __put_user_check(x, ptr, size) \
({ \
long __pu_err = -EFAULT; \
__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; \
switch (size) { \
case 1: __put_user_8(x, __pu_addr); break; \