Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-x86 / uaccess_64.h

diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h
index 4e3ec004e14a53973c4d51a30ecaa8731106cc3e..515d4dce96b598bc6e9d07dba21332a44924948c 100644 (file)
--- a/include/asm-x86/uaccess_64.h
+++ b/include/asm-x86/uaccess_64.h
@@ -195,4 +195,7 @@ static inline int __copy_from_user_inatomic_nocache(void *dst,
        return __copy_user_nocache(dst, src, size, 0);
 }
 
+unsigned long
+copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
+
 #endif /* __X86_64_UACCESS_H */