linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-um / uaccess.h

diff --git a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h
index 16c734a..2ee028b 100644 (file)
--- a/include/asm-um/uaccess.h
+++ b/include/asm-um/uaccess.h
@@ -41,28 +41,28 @@
 
 #define __get_user(x, ptr) \
 ({ \
-       const __typeof__(*(ptr)) __user *__private_ptr = (ptr); \
-       __typeof__(x) __private_val;                    \
-       int __private_ret = -EFAULT;                    \
-       (x) = (__typeof__(*(__private_ptr)))0;                          \
-       if (__copy_from_user((__force void *)&__private_val, (__private_ptr),\
-                            sizeof(*(__private_ptr))) == 0) {          \
-               (x) = (__typeof__(*(__private_ptr))) __private_val;     \
-               __private_ret = 0;                                      \
-       }                                                               \
-       __private_ret;                                                  \
+        const __typeof__(ptr) __private_ptr = ptr; \
+        __typeof__(*(__private_ptr)) __private_val; \
+        int __private_ret = -EFAULT; \
+        (x) = (__typeof__(*(__private_ptr)))0; \
+       if (__copy_from_user(&__private_val, (__private_ptr), \
+           sizeof(*(__private_ptr))) == 0) {\
+               (x) = (__typeof__(*(__private_ptr))) __private_val; \
+               __private_ret = 0; \
+       } \
+        __private_ret; \
 }) 
 
 #define get_user(x, ptr) \
 ({ \
         const __typeof__((*(ptr))) __user *private_ptr = (ptr); \
         (access_ok(VERIFY_READ, private_ptr, sizeof(*private_ptr)) ? \
-        __get_user(x, private_ptr) : ((x) = (__typeof__(*ptr))0, -EFAULT)); \
+        __get_user(x, private_ptr) : ((x) = 0, -EFAULT)); \
 })
 
 #define __put_user(x, ptr) \
 ({ \
-        __typeof__(*(ptr)) __user *__private_ptr = ptr; \
+        __typeof__(ptr) __private_ptr = ptr; \
         __typeof__(*(__private_ptr)) __private_val; \
         int __private_ret = -EFAULT; \
         __private_val = (__typeof__(*(__private_ptr))) (x); \
@@ -89,3 +89,14 @@ struct exception_table_entry
 };
 
 #endif
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */