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/cris | |
| 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/cris')
| -rw-r--r-- | arch/cris/include/asm/uaccess.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/cris/include/asm/uaccess.h b/arch/cris/include/asm/uaccess.h index 0d473aec3066..b0c6b077b632 100644 --- a/arch/cris/include/asm/uaccess.h +++ b/arch/cris/include/asm/uaccess.h @@ -173,12 +173,6 @@ extern unsigned long __copy_user_in(void *to, const void __user *from, unsigned extern unsigned long __do_clear_user(void __user *to, unsigned long n); static inline long -__strncpy_from_user(char *dst, const char __user *src, long count) -{ - return __do_strncpy_from_user(dst, src, count); -} - -static inline long strncpy_from_user(char *dst, const char __user *src, long count) { long res = -EFAULT; @@ -363,6 +357,4 @@ __clear_user(void __user *to, unsigned long n) return __do_clear_user(to, n); } -#define strlen_user(str) strnlen_user((str), 0x7ffffffe) - #endif /* _CRIS_UACCESS_H */ |