diff --git a/[refs] b/[refs] index 918089a44f00..099b572d4d59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87253d1b4f2b5a29bdfc6275b9fb52a47d72df64 +refs/heads/master: e9406597884b5c2f196b124bdd6af47351562a9d diff --git a/trunk/arch/x86/lib/memmove_64.c b/trunk/arch/x86/lib/memmove_64.c index 80175e47b190..0a33909bf122 100644 --- a/trunk/arch/x86/lib/memmove_64.c +++ b/trunk/arch/x86/lib/memmove_64.c @@ -6,10 +6,10 @@ #include #undef memmove -void *memmove(void * dest,const void *src,size_t count) +void *memmove(void *dest, const void *src, size_t count) { - if (dest < src) { - return memcpy(dest,src,count); + if (dest < src) { + return memcpy(dest, src, count); } else { char *p = dest + count; const char *s = src + count; @@ -17,5 +17,5 @@ void *memmove(void * dest,const void *src,size_t count) *--p = *--s; } return dest; -} +} EXPORT_SYMBOL(memmove);