x86_64: move lib

Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2007-10-11 11:17:08 +02:00 · 2007-10-11 11:17:08 +02:00 · 185f3d3890
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
 include ${srctree}/arch/x86/lib/Makefile_32
 else
-include ${srctree}/arch/x86_64/lib/Makefile_64
+include ${srctree}/arch/x86/lib/Makefile_64
 endif
--- a/arch/x86_64/lib/Makefile_64
+++ b/arch/x86_64/lib/Makefile_64
--- a/arch/x86_64/lib/bitops_64.c
+++ b/arch/x86_64/lib/bitops_64.c
--- a/arch/x86_64/lib/bitstr_64.c
+++ b/arch/x86_64/lib/bitstr_64.c
--- a/arch/x86_64/lib/clear_page_64.S
+++ b/arch/x86_64/lib/clear_page_64.S
--- a/arch/x86_64/lib/copy_page_64.S
+++ b/arch/x86_64/lib/copy_page_64.S
--- a/arch/x86_64/lib/copy_user_64.S
+++ b/arch/x86_64/lib/copy_user_64.S
--- a/arch/x86_64/lib/copy_user_nocache_64.S
+++ b/arch/x86_64/lib/copy_user_nocache_64.S
--- a/arch/x86_64/lib/csum-copy_64.S
+++ b/arch/x86_64/lib/csum-copy_64.S
--- a/arch/x86_64/lib/csum-partial_64.c
+++ b/arch/x86_64/lib/csum-partial_64.c
--- a/arch/x86_64/lib/csum-wrappers_64.c
+++ b/arch/x86_64/lib/csum-wrappers_64.c
--- a/arch/x86_64/lib/delay_64.c
+++ b/arch/x86_64/lib/delay_64.c
--- a/arch/x86_64/lib/getuser_64.S
+++ b/arch/x86_64/lib/getuser_64.S
--- a/arch/x86_64/lib/io_64.c
+++ b/arch/x86_64/lib/io_64.c
--- a/arch/x86_64/lib/iomap_copy_64.S
+++ b/arch/x86_64/lib/iomap_copy_64.S
--- a/arch/x86_64/lib/memcpy_64.S
+++ b/arch/x86_64/lib/memcpy_64.S
--- a/arch/x86_64/lib/memmove_64.c
+++ b/arch/x86_64/lib/memmove_64.c
--- a/arch/x86_64/lib/memset_64.S
+++ b/arch/x86_64/lib/memset_64.S
--- a/arch/x86_64/lib/putuser_64.S
+++ b/arch/x86_64/lib/putuser_64.S
--- a/arch/x86_64/lib/rwlock_64.S
+++ b/arch/x86_64/lib/rwlock_64.S
--- a/arch/x86_64/lib/thunk_64.S
+++ b/arch/x86_64/lib/thunk_64.S
--- a/arch/x86_64/lib/usercopy_64.c
+++ b/arch/x86_64/lib/usercopy_64.c
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@ -73,7 +73,7 @@ AFLAGS += -m64

 head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task_64.o

-libs-y 					+= arch/x86_64/lib/
+libs-y 					+= arch/x86/lib/
 core-y					+= arch/x86_64/kernel/ \
 					   arch/x86_64/mm/ \
 					   arch/x86/crypto/ \
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@ -1,5 +0,0 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/lib/Makefile_32
-else
-include ${srctree}/arch/x86_64/lib/Makefile_64
-endif
--- a/arch/x86_64/lib/msr-on-cpu.c
+++ b/arch/x86_64/lib/msr-on-cpu.c
@ -1 +0,0 @@
-#include "../../x86/lib/msr-on-cpu.c"