From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 22 Feb 2013 08:58:21 +0000 (+0000)
Subject: xen: arm: Use generic mem{cpy, move, set, zero} on 64-bit
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7184
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7a016c8427353f9876560d7e01ea16f7a42d7fcb;p=xen.git

xen: arm: Use generic mem{cpy, move, set, zero} on 64-bit

No optimised versions are available in Linux yet (meaning I couldn't
copy them).

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/include/asm-arm/string.h b/xen/include/asm-arm/string.h
index 9cd4dd7321..abfa9d20af 100644
--- a/xen/include/asm-arm/string.h
+++ b/xen/include/asm-arm/string.h
@@ -3,6 +3,7 @@
 
 #include <xen/config.h>
 
+#if defined(CONFIG_ARM_32)
 #define __HAVE_ARCH_MEMCPY
 extern void * memcpy(void *, const void *, __kernel_size_t);
 
@@ -27,6 +28,8 @@ extern void __memzero(void *ptr, __kernel_size_t n);
                 (__p);                                                  \
         })
 
+#endif
+
 #endif /* __ARM_STRING_H__ */
 /*
  * Local variables: