diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 07:07:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 07:07:44 +0200 |
commit | dc502142b65b9e31eb90ab4344b3acadb2698317 (patch) | |
tree | 59be531fcce876dbe0bbc1ddf5a84fc9b3ee8a27 /arch/frv | |
parent | Merge branch 'work.probe_kernel_read' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | s390 keyboard.c: don't open-code strndup_user() (diff) | |
download | linux-dc502142b65b9e31eb90ab4344b3acadb2698317.tar.xz linux-dc502142b65b9e31eb90ab4344b3acadb2698317.zip |
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/frv')
-rw-r--r-- | arch/frv/include/asm/uaccess.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/frv/include/asm/uaccess.h b/arch/frv/include/asm/uaccess.h index e4e33b4cd3ae..ff9562dc6825 100644 --- a/arch/frv/include/asm/uaccess.h +++ b/arch/frv/include/asm/uaccess.h @@ -282,6 +282,4 @@ clear_user(void __user *to, unsigned long n) extern long strncpy_from_user(char *dst, const char __user *src, long count); extern long strnlen_user(const char __user *src, long count); -#define strlen_user(str) strnlen_user(str, 32767) - #endif /* _ASM_UACCESS_H */ |