summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-08 20:15:02 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-08 20:15:02 +0300
commit46ace66b3b34c80341c6290cd608aae4d2de9879 (patch)
tree81690f3d0e3e73e898ac38f6689f8e8f798b3697 /include/linux
parentcee37d83e6d9ada1c2254c73bac7955f9e048d22 (diff)
parent119d0312c766773ca3238b9d926077664eed22be (diff)
downloadlinux-46ace66b3b34c80341c6290cd608aae4d2de9879.tar.xz
Merge branch 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull __copy_in_user removal from Al Viro: "There used to be 6 places in the entire tree calling __copy_in_user(), all of them bogus. Four got killed off in work.drm branch, this takes care of the remaining ones and kills the definition of that sucker" * 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: kill __copy_in_user() sanitize do_i2c_smbus_ioctl()
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/uaccess.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 80b587085e79..acdd6f915a8d 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -156,12 +156,6 @@ 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)
-{
- might_fault();
- return raw_copy_in_user(to, from, n);
-}
-static __always_inline unsigned long __must_check
copy_in_user(void __user *to, const void *from, unsigned long n)
{
might_fault();