Merge branches 'release' and 'throttling-domains' into release

[sfrench/cifs-2.6.git] / arch / x86 / lib / memcpy_32.c

diff --git a/arch/x86/lib/memcpy_32.c b/arch/x86/lib/memcpy_32.c
index 8ac51b82a632ca61a4e112a66301816cb0daf2d5..37756b6fb32992c5d703b5ccacf9fd02661213a1 100644 (file)
--- a/arch/x86/lib/memcpy_32.c
+++ b/arch/x86/lib/memcpy_32.c
@@ -34,8 +34,8 @@ void *memmove(void *dest, const void *src, size_t n)
                        "cld"
                        : "=&c" (d0), "=&S" (d1), "=&D" (d2)
                        :"0" (n),
-                        "1" (n-1+(const char *)src),
-                        "2" (n-1+(char *)dest)
+                        "1" (n-1+src),
+                        "2" (n-1+dest)
                        :"memory");
        }
        return dest;