Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

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

diff --git a/arch/x86/lib/memmove_64.c b/arch/x86/lib/memmove_64.c
index 751ebae8ec4251bf74211bbfd937bd8c5a2b09df..80175e47b1902e4a3b5015599a5cc102e3922008 100644 (file)
--- a/arch/x86/lib/memmove_64.c
+++ b/arch/x86/lib/memmove_64.c
@@ -11,8 +11,8 @@ void *memmove(void * dest,const void *src,size_t 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;
        }