Merge branch 'akpm' (patches from Andrew)

[linux.git] / mm / kasan / common.c

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index c15d8ae68c9673b2fd62b0a7b7eab2aa387aec2e..6aa51723b92b9922c3b8063b02043419f317f3ee 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -110,6 +110,7 @@ void *memset(void *addr, int c, size_t len)
        return __memset(addr, c, len);
 }
 
+#ifdef __HAVE_ARCH_MEMMOVE
 #undef memmove
 void *memmove(void *dest, const void *src, size_t len)
 {
@@ -118,6 +119,7 @@ void *memmove(void *dest, const void *src, size_t len)
 
        return __memmove(dest, src, len);
 }
+#endif
 
 #undef memcpy
 void *memcpy(void *dest, const void *src, size_t len)