Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / include / asm-powerpc / uaccess.h

diff --git a/include/asm-powerpc/uaccess.h b/include/asm-powerpc/uaccess.h
index 035338b..3872e92 100644 (file)
--- a/include/asm-powerpc/uaccess.h
+++ b/include/asm-powerpc/uaccess.h
@@ -115,21 +115,11 @@ struct exception_table_entry {
 #define __put_user64(x, ptr) __put_user(x, ptr)
 #endif
 
-#ifdef __powerpc64__
 #define __get_user_unaligned __get_user
 #define __put_user_unaligned __put_user
-#endif
 
 extern long __put_user_bad(void);
 
-#ifdef __powerpc64__
-#define __EX_TABLE_ALIGN       "3"
-#define __EX_TABLE_TYPE                "llong"
-#else
-#define __EX_TABLE_ALIGN       "2"
-#define __EX_TABLE_TYPE                "long"
-#endif
-
 /*
  * We don't tell gcc that we are accessing memory, but this is OK
  * because we do not write to any memory gcc knows about, so there
@@ -144,11 +134,12 @@ extern long __put_user_bad(void);
                "       b 2b\n"                                 \
                ".previous\n"                                   \
                ".section __ex_table,\"a\"\n"                   \
-               "       .align " __EX_TABLE_ALIGN "\n"          \
-               "       ."__EX_TABLE_TYPE" 1b,3b\n"             \
+               "       .balign %5\n"                           \
+                       PPC_LONG "1b,3b\n"                      \
                ".previous"                                     \
                : "=r" (err)                                    \
-               : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
+               : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\
+                 "i"(sizeof(unsigned long)))
 
 #ifdef __powerpc64__
 #define __put_user_asm2(x, ptr, retval)                                \
@@ -164,12 +155,13 @@ extern long __put_user_bad(void);
                "       b 3b\n"                                 \
                ".previous\n"                                   \
                ".section __ex_table,\"a\"\n"                   \
-               "       .align " __EX_TABLE_ALIGN "\n"          \
-               "       ." __EX_TABLE_TYPE " 1b,4b\n"           \
-               "       ." __EX_TABLE_TYPE " 2b,4b\n"           \
+               "       .balign %5\n"                           \
+                       PPC_LONG "1b,4b\n"                      \
+                       PPC_LONG "2b,4b\n"                      \
                ".previous"                                     \
                : "=r" (err)                                    \
-               : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
+               : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\
+                 "i"(sizeof(unsigned long)))
 #endif /* __powerpc64__ */
 
 #define __put_user_size(x, ptr, size, retval)                  \
@@ -215,11 +207,12 @@ extern long __get_user_bad(void);
                "       b 2b\n"                         \
                ".previous\n"                           \
                ".section __ex_table,\"a\"\n"           \
-               "       .align "__EX_TABLE_ALIGN "\n"   \
-               "       ." __EX_TABLE_TYPE " 1b,3b\n"   \
+               "       .balign %5\n"                   \
+                       PPC_LONG "1b,3b\n"              \
                ".previous"                             \
                : "=r" (err), "=r" (x)                  \
-               : "b" (addr), "i" (-EFAULT), "0" (err))
+               : "b" (addr), "i" (-EFAULT), "0" (err), \
+                 "i"(sizeof(unsigned long)))
 
 #ifdef __powerpc64__
 #define __get_user_asm2(x, addr, err)                  \
@@ -237,12 +230,13 @@ extern long __get_user_bad(void);
                "       b 3b\n"                         \
                ".previous\n"                           \
                ".section __ex_table,\"a\"\n"           \
-               "       .align " __EX_TABLE_ALIGN "\n"  \
-               "       ." __EX_TABLE_TYPE " 1b,4b\n"   \
-               "       ." __EX_TABLE_TYPE " 2b,4b\n"   \
+               "       .balign %5\n"                   \
+                       PPC_LONG "1b,4b\n"              \
+                       PPC_LONG "2b,4b\n"              \
                ".previous"                             \
                : "=r" (err), "=&r" (x)                 \
-               : "b" (addr), "i" (-EFAULT), "0" (err))
+               : "b" (addr), "i" (-EFAULT), "0" (err), \
+                 "i"(sizeof(unsigned long)))
 #endif /* __powerpc64__ */
 
 #define __get_user_size(x, ptr, size, retval)                  \
@@ -333,9 +327,6 @@ extern inline unsigned long copy_to_user(void __user *to,
        return n;
 }
 
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
 #else /* __powerpc64__ */
 
 #define __copy_in_user(to, from, size) \
@@ -348,6 +339,8 @@ extern unsigned long copy_to_user(void __user *to, const void *from,
 extern unsigned long copy_in_user(void __user *to, const void __user *from,
                                  unsigned long n);
 
+#endif /* __powerpc64__ */
+
 static inline unsigned long __copy_from_user_inatomic(void *to,
                const void __user *from, unsigned long n)
 {
@@ -368,9 +361,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
                        __get_user_size(*(u64 *)to, from, 8, ret);
                        break;
                }
-               return (ret == -EFAULT) ? n : 0;
+               if (ret == 0)
+                       return 0;
        }
-       return __copy_tofrom_user((__force void __user *) to, from, n);
+       return __copy_tofrom_user((__force void __user *)to, from, n);
 }
 
 static inline unsigned long __copy_to_user_inatomic(void __user *to,
@@ -393,33 +387,24 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
                        __put_user_size(*(u64 *)from, (u64 __user *)to, 8, ret);
                        break;
                }
-               return (ret == -EFAULT) ? n : 0;
+               if (ret == 0)
+                       return 0;
        }
-       return __copy_tofrom_user(to, (__force const void __user *) from, n);
+       return __copy_tofrom_user(to, (__force const void __user *)from, n);
 }
 
-#endif /* __powerpc64__ */
-
 static inline unsigned long __copy_from_user(void *to,
                const void __user *from, unsigned long size)
 {
        might_sleep();
-#ifndef __powerpc64__
-       return __copy_tofrom_user((__force void __user *)to, from, size);
-#else /* __powerpc64__ */
        return __copy_from_user_inatomic(to, from, size);
-#endif /* __powerpc64__ */
 }
 
 static inline unsigned long __copy_to_user(void __user *to,
                const void *from, unsigned long size)
 {
        might_sleep();
-#ifndef __powerpc64__
-       return __copy_tofrom_user(to, (__force void __user *)from, size);
-#else /* __powerpc64__ */
        return __copy_to_user_inatomic(to, from, size);
-#endif /* __powerpc64__ */
 }
 
 extern unsigned long __clear_user(void __user *addr, unsigned long size);
@@ -429,12 +414,10 @@ static inline unsigned long clear_user(void __user *addr, unsigned long size)
        might_sleep();
        if (likely(access_ok(VERIFY_WRITE, addr, size)))
                return __clear_user(addr, size);
-#ifndef __powerpc64__
        if ((unsigned long)addr < TASK_SIZE) {
                unsigned long over = (unsigned long)addr + size - TASK_SIZE;
                return __clear_user(addr, size - over) + over;
        }
-#endif /* __powerpc64__ */
        return size;
 }