---

yaml --- r: 30522 b: refs/heads/master c: 6bfa9bb h: refs/heads/master v: v3
git-mirror · Jun 26, 2006 · eb0dde0 · eb0dde0
1 parent edd3215
commit eb0dde0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ee60e17896c65da1df5780d3196c050bccb7d10
+refs/heads/master: 6bfa9bb5195c68f75bd3937e4d77cb0bfe852d0d
diff --git a/trunk/arch/x86_64/lib/memmove.c b/trunk/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/trunk/arch/x86_64/lib/usercopy.c b/trunk/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);