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/sh/include/asm | |
| 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/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/uaccess.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h index 2722b61b2283..211b44920dbe 100644 --- a/arch/sh/include/asm/uaccess.h +++ b/arch/sh/include/asm/uaccess.h @@ -100,7 +100,6 @@ struct __large_struct { unsigned long buf[100]; }; extern long strncpy_from_user(char *dest, const char __user *src, long count); -extern __must_check long strlen_user(const char __user *str); extern __must_check long strnlen_user(const char __user *str, long n); /* Generic arbitrary sized copy. */ |