From 5fa2ae8e9e6c5a23e0e3955d3c0d55c1e08e603f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:15:42 +0200
Subject: x86_64: prepare shared lib/memmove.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86_64/lib/Makefile     |  2 +-
 arch/x86_64/lib/memmove.c    | 21 ---------------------
 arch/x86_64/lib/memmove_64.c | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 arch/x86_64/lib/memmove.c
 create mode 100644 arch/x86_64/lib/memmove_64.c

(limited to 'arch')

diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 67133edf7d2..ca4df1ee653 100644
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 lib-y := csum-partial.o csum-copy_64.o csum-wrappers.o delay.o \
 	usercopy.o getuser.o putuser.o  \
 	thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops.o
-lib-y += memcpy_64.o memmove.o memset.o copy_user.o rwlock_64.o copy_user_nocache_64.o
+lib-y += memcpy_64.o memmove_64.o memset.o copy_user.o rwlock_64.o copy_user_nocache_64.o
diff --git a/arch/x86_64/lib/memmove.c b/arch/x86_64/lib/memmove.c
deleted file mode 100644
index 751ebae8ec4..00000000000
--- a/arch/x86_64/lib/memmove.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Normally compiler builtins are used, but sometimes the compiler calls out
-   of line code. Based on asm-i386/string.h.
- */
-#define _STRING_C
-#include <linux/string.h>
-#include <linux/module.h>
-
-#undef memmove
-void *memmove(void * dest,const void *src,size_t count)
-{
-	if (dest < src) { 
-		return memcpy(dest,src,count);
-	} else {
-		char *p = (char *) dest + count;
-		char *s = (char *) src + count;
-		while (count--)
-			*--p = *--s;
-	}
-	return dest;
-} 
-EXPORT_SYMBOL(memmove);
diff --git a/arch/x86_64/lib/memmove_64.c b/arch/x86_64/lib/memmove_64.c
new file mode 100644
index 00000000000..751ebae8ec4
--- /dev/null
+++ b/arch/x86_64/lib/memmove_64.c
@@ -0,0 +1,21 @@
+/* Normally compiler builtins are used, but sometimes the compiler calls out
+   of line code. Based on asm-i386/string.h.
+ */
+#define _STRING_C
+#include <linux/string.h>
+#include <linux/module.h>
+
+#undef memmove
+void *memmove(void * dest,const void *src,size_t count)
+{
+	if (dest < src) { 
+		return memcpy(dest,src,count);
+	} else {
+		char *p = (char *) dest + count;
+		char *s = (char *) src + count;
+		while (count--)
+			*--p = *--s;
+	}
+	return dest;
+} 
+EXPORT_SYMBOL(memmove);
-- 
cgit v1.2.3