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

[linux-2.6-block.git] / arch / ia64 / include / asm / uaccess.h

diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
index 3f5ca0b8328a003bf0255dfd095f09a848bd25e3..4132497d8ee68014b145a76a99fe037dd78d35e5 100644 (file)
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
@@ -76,8 +76,8 @@
  * (a) re-use the arguments for side effects (sizeof/typeof is ok)
  * (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())
-#define get_user(x, ptr)       __get_user_check((x), (ptr), sizeof(*(ptr)), get_fs())
+#define put_user(x, ptr)       __put_user_check((__typeof__(*(ptr))) (x), (ptr), sizeof(*(ptr)))
+#define get_user(x, ptr)       __get_user_check((x), (ptr), sizeof(*(ptr)))
 
 /*
  * The "__xxx" versions do not do address space checking, useful when
@@ -199,7 +199,7 @@ extern void __get_user_unknown (void);
 })
 
 #define __get_user_nocheck(x, ptr, size)       __do_get_user(0, x, ptr, size, KERNEL_DS)
-#define __get_user_check(x, ptr, size, segment)        __do_get_user(1, x, ptr, size, segment)
+#define __get_user_check(x, ptr, size) __do_get_user(1, x, ptr, size, get_fs())
 
 extern void __put_user_unknown (void);
 
@@ -226,7 +226,7 @@ extern void __put_user_unknown (void);
 })
 
 #define __put_user_nocheck(x, ptr, size)       __do_put_user(0, x, ptr, size, KERNEL_DS)
-#define __put_user_check(x, ptr, size, segment)        __do_put_user(1, x, ptr, size, segment)
+#define __put_user_check(x, ptr, size) __do_put_user(1, x, ptr, size, get_fs())
 
 /*
  * Complex access routines