1 files changed, 40 insertions, 6 deletions

diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c
index ffb9c5c9d748..f3c57e341402 100644
--- a/arch/x86/boot/compressed/string.c
+++ b/arch/x86/boot/compressed/string.c
@@ -1,11 +1,45 @@
 #include "misc.h"
+#include "../string.c"
+
+/* misc.h might pull in string_32.h which has a macro for memcpy. undef that */
+#undef memcpy
 
-int memcmp(const void *s1, const void *s2, size_t len)
+#ifdef CONFIG_X86_32
+void *memcpy(void *dest, const void *src, size_t n)
 {
-        u8 diff;
-        asm("repe; cmpsb; setnz %0"
-            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
-        return diff;
+        int d0, d1, d2;
+        asm volatile(
+                "rep ; movsl\n\t"
+                "movl %4,%%ecx\n\t"
+                "rep ; movsb\n\t"
+                : "=&c" (d0), "=&D" (d1), "=&S" (d2)
+                : "0" (n >> 2), "g" (n & 3), "1" (dest), "2" (src)
+                : "memory");
+
+        return dest;
 }
+#else
+void *memcpy(void *dest, const void *src, size_t n)
+{
+        long d0, d1, d2;
+        asm volatile(
+                "rep ; movsq\n\t"
+                "movq %4,%%rcx\n\t"
+                "rep ; movsb\n\t"
+                : "=&c" (d0), "=&D" (d1), "=&S" (d2)
+                : "0" (n >> 3), "g" (n & 7), "1" (dest), "2" (src)
+                : "memory");
 
-#include "../string.c"
+        return dest;
+}
+#endif
+
+void *memset(void *s, int c, size_t n)
+{
+        int i;
+        char *ss = s;
+
+        for (i = 0; i < n; i++)
+                ss[i] = c;
+        return s;
+}