From 185f3d38900f750a4566f87cde6a178f3595a115 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:17:08 +0200 Subject: [PATCH] x86_64: move lib Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/lib/Makefile | 2 +- arch/{x86_64 => x86}/lib/Makefile_64 | 0 arch/{x86_64 => x86}/lib/bitops_64.c | 0 arch/{x86_64 => x86}/lib/bitstr_64.c | 0 arch/{x86_64 => x86}/lib/clear_page_64.S | 0 arch/{x86_64 => x86}/lib/copy_page_64.S | 0 arch/{x86_64 => x86}/lib/copy_user_64.S | 0 arch/{x86_64 => x86}/lib/copy_user_nocache_64.S | 0 arch/{x86_64 => x86}/lib/csum-copy_64.S | 0 arch/{x86_64 => x86}/lib/csum-partial_64.c | 0 arch/{x86_64 => x86}/lib/csum-wrappers_64.c | 0 arch/{x86_64 => x86}/lib/delay_64.c | 0 arch/{x86_64 => x86}/lib/getuser_64.S | 0 arch/{x86_64 => x86}/lib/io_64.c | 0 arch/{x86_64 => x86}/lib/iomap_copy_64.S | 0 arch/{x86_64 => x86}/lib/memcpy_64.S | 0 arch/{x86_64 => x86}/lib/memmove_64.c | 0 arch/{x86_64 => x86}/lib/memset_64.S | 0 arch/{x86_64 => x86}/lib/putuser_64.S | 0 arch/{x86_64 => x86}/lib/rwlock_64.S | 0 arch/{x86_64 => x86}/lib/thunk_64.S | 0 arch/{x86_64 => x86}/lib/usercopy_64.c | 0 arch/x86_64/Makefile | 2 +- arch/x86_64/lib/Makefile | 5 ----- arch/x86_64/lib/msr-on-cpu.c | 1 - 25 files changed, 2 insertions(+), 8 deletions(-) rename arch/{x86_64 => x86}/lib/Makefile_64 (100%) rename arch/{x86_64 => x86}/lib/bitops_64.c (100%) rename arch/{x86_64 => x86}/lib/bitstr_64.c (100%) rename arch/{x86_64 => x86}/lib/clear_page_64.S (100%) rename arch/{x86_64 => x86}/lib/copy_page_64.S (100%) rename arch/{x86_64 => x86}/lib/copy_user_64.S (100%) rename arch/{x86_64 => x86}/lib/copy_user_nocache_64.S (100%) rename arch/{x86_64 => x86}/lib/csum-copy_64.S (100%) rename arch/{x86_64 => x86}/lib/csum-partial_64.c (100%) rename arch/{x86_64 => x86}/lib/csum-wrappers_64.c (100%) rename arch/{x86_64 => x86}/lib/delay_64.c (100%) rename arch/{x86_64 => x86}/lib/getuser_64.S (100%) rename arch/{x86_64 => x86}/lib/io_64.c (100%) rename arch/{x86_64 => x86}/lib/iomap_copy_64.S (100%) rename arch/{x86_64 => x86}/lib/memcpy_64.S (100%) rename arch/{x86_64 => x86}/lib/memmove_64.c (100%) rename arch/{x86_64 => x86}/lib/memset_64.S (100%) rename arch/{x86_64 => x86}/lib/putuser_64.S (100%) rename arch/{x86_64 => x86}/lib/rwlock_64.S (100%) rename arch/{x86_64 => x86}/lib/thunk_64.S (100%) rename arch/{x86_64 => x86}/lib/usercopy_64.c (100%) delete mode 100644 arch/x86_64/lib/Makefile delete mode 100644 arch/x86_64/lib/msr-on-cpu.c diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 2d7d724a2a6a..329da276c6f1 100644 --- 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 diff --git a/arch/x86_64/lib/Makefile_64 b/arch/x86/lib/Makefile_64 similarity index 100% rename from arch/x86_64/lib/Makefile_64 rename to arch/x86/lib/Makefile_64 diff --git a/arch/x86_64/lib/bitops_64.c b/arch/x86/lib/bitops_64.c similarity index 100% rename from arch/x86_64/lib/bitops_64.c rename to arch/x86/lib/bitops_64.c diff --git a/arch/x86_64/lib/bitstr_64.c b/arch/x86/lib/bitstr_64.c similarity index 100% rename from arch/x86_64/lib/bitstr_64.c rename to arch/x86/lib/bitstr_64.c diff --git a/arch/x86_64/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S similarity index 100% rename from arch/x86_64/lib/clear_page_64.S rename to arch/x86/lib/clear_page_64.S diff --git a/arch/x86_64/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S similarity index 100% rename from arch/x86_64/lib/copy_page_64.S rename to arch/x86/lib/copy_page_64.S diff --git a/arch/x86_64/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S similarity index 100% rename from arch/x86_64/lib/copy_user_64.S rename to arch/x86/lib/copy_user_64.S diff --git a/arch/x86_64/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S similarity index 100% rename from arch/x86_64/lib/copy_user_nocache_64.S rename to arch/x86/lib/copy_user_nocache_64.S diff --git a/arch/x86_64/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S similarity index 100% rename from arch/x86_64/lib/csum-copy_64.S rename to arch/x86/lib/csum-copy_64.S diff --git a/arch/x86_64/lib/csum-partial_64.c b/arch/x86/lib/csum-partial_64.c similarity index 100% rename from arch/x86_64/lib/csum-partial_64.c rename to arch/x86/lib/csum-partial_64.c diff --git a/arch/x86_64/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c similarity index 100% rename from arch/x86_64/lib/csum-wrappers_64.c rename to arch/x86/lib/csum-wrappers_64.c diff --git a/arch/x86_64/lib/delay_64.c b/arch/x86/lib/delay_64.c similarity index 100% rename from arch/x86_64/lib/delay_64.c rename to arch/x86/lib/delay_64.c diff --git a/arch/x86_64/lib/getuser_64.S b/arch/x86/lib/getuser_64.S similarity index 100% rename from arch/x86_64/lib/getuser_64.S rename to arch/x86/lib/getuser_64.S diff --git a/arch/x86_64/lib/io_64.c b/arch/x86/lib/io_64.c similarity index 100% rename from arch/x86_64/lib/io_64.c rename to arch/x86/lib/io_64.c diff --git a/arch/x86_64/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S similarity index 100% rename from arch/x86_64/lib/iomap_copy_64.S rename to arch/x86/lib/iomap_copy_64.S diff --git a/arch/x86_64/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S similarity index 100% rename from arch/x86_64/lib/memcpy_64.S rename to arch/x86/lib/memcpy_64.S diff --git a/arch/x86_64/lib/memmove_64.c b/arch/x86/lib/memmove_64.c similarity index 100% rename from arch/x86_64/lib/memmove_64.c rename to arch/x86/lib/memmove_64.c diff --git a/arch/x86_64/lib/memset_64.S b/arch/x86/lib/memset_64.S similarity index 100% rename from arch/x86_64/lib/memset_64.S rename to arch/x86/lib/memset_64.S diff --git a/arch/x86_64/lib/putuser_64.S b/arch/x86/lib/putuser_64.S similarity index 100% rename from arch/x86_64/lib/putuser_64.S rename to arch/x86/lib/putuser_64.S diff --git a/arch/x86_64/lib/rwlock_64.S b/arch/x86/lib/rwlock_64.S similarity index 100% rename from arch/x86_64/lib/rwlock_64.S rename to arch/x86/lib/rwlock_64.S diff --git a/arch/x86_64/lib/thunk_64.S b/arch/x86/lib/thunk_64.S similarity index 100% rename from arch/x86_64/lib/thunk_64.S rename to arch/x86/lib/thunk_64.S diff --git a/arch/x86_64/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c similarity index 100% rename from arch/x86_64/lib/usercopy_64.c rename to arch/x86/lib/usercopy_64.c diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 265484c17234..ae48f179d719 100644 --- 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/ \ diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile deleted file mode 100644 index 2d7d724a2a6a..000000000000 --- a/arch/x86_64/lib/Makefile +++ /dev/null @@ -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 diff --git a/arch/x86_64/lib/msr-on-cpu.c b/arch/x86_64/lib/msr-on-cpu.c deleted file mode 100644 index 5672d4190fbe..000000000000 --- a/arch/x86_64/lib/msr-on-cpu.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../x86/lib/msr-on-cpu.c" -- 2.20.1