vserver 1.9.5.x5

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

diff --git a/include/asm-ppc64/uaccess.h b/include/asm-ppc64/uaccess.h
index 77906c9..e5cdda1 100644 (file)
--- a/include/asm-ppc64/uaccess.h
+++ b/include/asm-ppc64/uaccess.h
@@ -111,6 +111,9 @@ extern unsigned long search_exception_table(unsigned long);
 #define __put_user(x,ptr) \
   __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 
+#define __get_user_unaligned __get_user
+#define __put_user_unaligned __put_user
+
 extern long __put_user_bad(void);
 
 #define __put_user_nocheck(x,ptr,size)                         \
@@ -241,7 +244,7 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
                        return ret;
                }
        }
-       return __copy_tofrom_user((void __user *) to, from, n);
+       return __copy_tofrom_user((__force void __user *) to, from, n);
 }
 
 static inline unsigned long
@@ -266,7 +269,7 @@ __copy_to_user(void __user *to, const void *from, unsigned long n)
                        return ret;
                }
        }
-       return __copy_tofrom_user(to, (const void __user *) from, n);
+       return __copy_tofrom_user(to, (__force const void __user *) from, n);
 }
 
 #define __copy_in_user(to, from, size) \
@@ -281,6 +284,9 @@ extern unsigned long copy_in_user(void __user *to, const void __user *from,
 
 extern unsigned long __clear_user(void __user *addr, unsigned long size);
 
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+
 static inline unsigned long
 clear_user(void __user *addr, unsigned long size)
 {