Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / arch / x86 / lib / memmove_64.c

diff --git a/arch/x86/lib/memmove_64.c b/arch/x86/lib/memmove_64.c
index 751ebae8ec4251bf74211bbfd937bd8c5a2b09df..0a33909bf12213dbb0945d057e5c7c537296074e 100644 (file)
--- a/arch/x86/lib/memmove_64.c
+++ b/arch/x86/lib/memmove_64.c
@@ -6,16 +6,16 @@
 #include <linux/module.h>
 
 #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 = (char *) dest + count;
-               char *s = (char *) src + count;
+               char *p = dest + count;
+               const char *s = src + count;
                while (count--)
                        *--p = *--s;
        }
        return dest;
-} 
+}
 EXPORT_SYMBOL(memmove);