diff options
| -rw-r--r-- | arch/x86_64/lib/memmove.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/lib/usercopy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/lib/memmove.c b/arch/x86_64/lib/memmove.c index 517eb1bd9de..751ebae8ec4 100644 --- a/arch/x86_64/lib/memmove.c +++ b/arch/x86_64/lib/memmove.c @@ -9,7 +9,7 @@ void *memmove(void * dest,const void *src,size_t count) { if (dest < src) { - __inline_memcpy(dest,src,count); + return memcpy(dest,src,count); } else { char *p = (char *) dest + count; char *s = (char *) src + count; diff --git a/arch/x86_64/lib/usercopy.c b/arch/x86_64/lib/usercopy.c index a82bfacdb1a..893d43f838c 100644 --- a/arch/x86_64/lib/usercopy.c +++ b/arch/x86_64/lib/usercopy.c @@ -55,7 +55,7 @@ strncpy_from_user(char *dst, const char __user *src, long count) { long res = -EFAULT; if (access_ok(VERIFY_READ, src, 1)) - __do_strncpy_from_user(dst, src, count, res); + return __strncpy_from_user(dst, src, count); return res; } EXPORT_SYMBOL(strncpy_from_user); |