Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/asm-v850/uaccess.h b/include/asm-v850/uaccess.h
index 1db9010..64563c4 100644 (file)
--- a/include/asm-v850/uaccess.h
+++ b/include/asm-v850/uaccess.h
@@ -14,7 +14,7 @@
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
 
-extern inline int access_ok (int type, const void *addr, unsigned long size)
+static inline int access_ok (int type, const void *addr, unsigned long size)
 {
        /* XXX I guess we should check against real ram bounds at least, and
           possibly make sure ADDR is not within the kernel.
@@ -27,11 +27,6 @@ extern inline int access_ok (int type, const void *addr, unsigned long size)
        return val >= (0x80 + NUM_CPU_IRQS*16) && val < 0xFFFFF000;
 }
 
-extern inline int verify_area (int type, const void *addr, unsigned long size)
-{
-       return access_ok (type, addr, size) ? 0 : -EFAULT;
-}
-
 /*
  * The exception table consists of pairs of addresses: the first is the
  * address of an instruction that is allowed to fault, and the second is
@@ -112,6 +107,9 @@ extern int bad_user_access_length (void);
 #define __copy_from_user(to, from, n)  (memcpy (to, from, n), 0)
 #define __copy_to_user(to, from, n)    (memcpy(to, from, n), 0)
 
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+
 #define copy_from_user(to, from, n)    __copy_from_user (to, from, n)
 #define copy_to_user(to, from, n)      __copy_to_user(to, from, n)