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/microblaze | |
| 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/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/uaccess.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h index 38f2c9ccef10..81f16aadbf9e 100644 --- a/arch/microblaze/include/asm/uaccess.h +++ b/arch/microblaze/include/asm/uaccess.h @@ -355,14 +355,12 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n) */ extern int __strncpy_user(char *to, const char __user *from, int len); -#define __strncpy_from_user __strncpy_user - static inline long strncpy_from_user(char *dst, const char __user *src, long count) { if (!access_ok(VERIFY_READ, src, 1)) return -EFAULT; - return __strncpy_from_user(dst, src, count); + return __strncpy_user(dst, src, count); } /* |