summaryrefslogtreecommitdiff
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 22:07:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 22:07:44 -0700
commitdc502142b65b9e31eb90ab4344b3acadb2698317 (patch)
tree59be531fcce876dbe0bbc1ddf5a84fc9b3ee8a27 /arch/um/kernel
parent90880b532a7ebd13a052d6c410807b33809a3efb (diff)
parentb7310105ab2cd9168fe50564d8b9d248325a326e (diff)
Merge branch 'uaccess.strlen' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull user access str* updates from Al Viro: "uaccess str...() dead code removal" * 'uaccess.strlen' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: s390 keyboard.c: don't open-code strndup_user() mips: get rid of unused __strnlen_user() get rid of unused __strncpy_from_user() instances kill strlen_user()
Diffstat (limited to 'arch/um/kernel')
-rw-r--r--arch/um/kernel/process.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index a9bd61820042..2c7f721eccbc 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -255,11 +255,6 @@ int clear_user_proc(void __user *buf, int size)
return clear_user(buf, size);
}
-int strlen_user_proc(char __user *str)
-{
- return strlen_user(str);
-}
-
int cpu(void)
{
return current_thread_info()->cpu;