Merge tag 'nfsd-4.14' of git://linux-nfs.org/~bfields/linux

[tomoyo/tomoyo-test1.git] / include / linux / uaccess.h

diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index acdd6f9..20ef8e6 100644 (file)
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -156,7 +156,7 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
 }
 #ifdef CONFIG_COMPAT
 static __always_inline unsigned long __must_check
-copy_in_user(void __user *to, const void *from, unsigned long n)
+copy_in_user(void __user *to, const void __user *from, unsigned long n)
 {
        might_fault();
        if (access_ok(VERIFY_WRITE, to, n) && access_ok(VERIFY_READ, from, n))