util: Move memcopy helper into the header

Since we will need it in parasite and restorer
code rename it to inline_memcpy to avoid name
collision.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

include/util.h

@@ -189,4 +189,18 @@ int open_fmt(char *fmt, int mode, ...);
 		__ret;							\
 	 })
 
+static void always_inline *inline_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");
+
+	return dest;
+}
+
 #endif /* UTIL_H_ */

parasite.c

@@ -12,6 +12,7 @@
 #include "syscall.h"
 #include "parasite.h"
 #include "image.h"
+#include "util.h"
 #include "crtools.h"
 
 #ifdef CONFIG_X86_64
@@ -21,20 +22,6 @@ static void *brk_start, *brk_end, *brk_tail;
 static struct page_entry page;
 static struct vma_entry vma;
 
-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");
-
-	return dest;
-}
-
 static void brk_init(void *brk)
 {
 	brk_start = brk_tail = brk;
@@ -148,7 +135,7 @@ static int restore_core(char *corefile)
 			goto err;
 		}
 
-		memcpy((void *)page.va, page.data, sizeof(page.data));
+		inline_memcpy((void *)page.va, page.data, sizeof(page.data));
 	}
 
 	ret = 0;