git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
x86_64
/
lib
/
memmove.c
diff --git
a/arch/x86_64/lib/memmove.c
b/arch/x86_64/lib/memmove.c
index
e93d525
..
751ebae
100644
(file)
--- a/
arch/x86_64/lib/memmove.c
+++ b/
arch/x86_64/lib/memmove.c
@@
-3,12
+3,13
@@
*/
#define _STRING_C
#include <linux/string.h>
*/
#define _STRING_C
#include <linux/string.h>
+#include <linux/module.h>
#undef memmove
void *memmove(void * dest,const void *src,size_t count)
{
if (dest < src) {
#undef memmove
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;
} else {
char *p = (char *) dest + count;
char *s = (char *) src + count;
@@
-17,3
+18,4
@@
void *memmove(void * dest,const void *src,size_t count)
}
return dest;
}
}
return dest;
}
+EXPORT_SYMBOL(memmove);