diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:08 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:08 +0200 |
commit | 185f3d38900f750a4566f87cde6a178f3595a115 (patch) | |
tree | d463f6da1af452b1bbdf476828ea88427087f255 | |
parent | 51b2833060f26258ea2da091c7b9c6a358ac9dd2 (diff) | |
download | linux-185f3d38900f750a4566f87cde6a178f3595a115.tar.gz linux-185f3d38900f750a4566f87cde6a178f3595a115.tar.bz2 linux-185f3d38900f750a4566f87cde6a178f3595a115.zip |
x86_64: move lib
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/lib/Makefile_64 (renamed from arch/x86_64/lib/Makefile_64) | 0 | ||||
-rw-r--r-- | arch/x86/lib/bitops_64.c (renamed from arch/x86_64/lib/bitops_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/bitstr_64.c (renamed from arch/x86_64/lib/bitstr_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/clear_page_64.S (renamed from arch/x86_64/lib/clear_page_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/copy_page_64.S (renamed from arch/x86_64/lib/copy_page_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/copy_user_64.S (renamed from arch/x86_64/lib/copy_user_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/copy_user_nocache_64.S (renamed from arch/x86_64/lib/copy_user_nocache_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/csum-copy_64.S (renamed from arch/x86_64/lib/csum-copy_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/csum-partial_64.c (renamed from arch/x86_64/lib/csum-partial_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/csum-wrappers_64.c (renamed from arch/x86_64/lib/csum-wrappers_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/delay_64.c (renamed from arch/x86_64/lib/delay_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/getuser_64.S (renamed from arch/x86_64/lib/getuser_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/io_64.c (renamed from arch/x86_64/lib/io_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/iomap_copy_64.S (renamed from arch/x86_64/lib/iomap_copy_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/memcpy_64.S (renamed from arch/x86_64/lib/memcpy_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/memmove_64.c (renamed from arch/x86_64/lib/memmove_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/lib/memset_64.S (renamed from arch/x86_64/lib/memset_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/putuser_64.S (renamed from arch/x86_64/lib/putuser_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/rwlock_64.S (renamed from arch/x86_64/lib/rwlock_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/thunk_64.S (renamed from arch/x86_64/lib/thunk_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/lib/usercopy_64.c (renamed from arch/x86_64/lib/usercopy_64.c) | 0 | ||||
-rw-r--r-- | arch/x86_64/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/lib/Makefile | 5 | ||||
-rw-r--r-- | arch/x86_64/lib/msr-on-cpu.c | 1 |
25 files changed, 2 insertions, 8 deletions
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 index bbabad3c9335..bbabad3c9335 100644 --- a/arch/x86_64/lib/Makefile_64 +++ b/arch/x86/lib/Makefile_64 diff --git a/arch/x86_64/lib/bitops_64.c b/arch/x86/lib/bitops_64.c index 95b6d9639fba..95b6d9639fba 100644 --- a/arch/x86_64/lib/bitops_64.c +++ b/arch/x86/lib/bitops_64.c diff --git a/arch/x86_64/lib/bitstr_64.c b/arch/x86/lib/bitstr_64.c index 24676609a6ac..24676609a6ac 100644 --- a/arch/x86_64/lib/bitstr_64.c +++ b/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 index 9a10a78bb4a4..9a10a78bb4a4 100644 --- a/arch/x86_64/lib/clear_page_64.S +++ b/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 index 727a5d46d2fc..727a5d46d2fc 100644 --- a/arch/x86_64/lib/copy_page_64.S +++ b/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 index 70bebd310408..70bebd310408 100644 --- a/arch/x86_64/lib/copy_user_64.S +++ b/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 index 4620efb12f13..4620efb12f13 100644 --- a/arch/x86_64/lib/copy_user_nocache_64.S +++ b/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 index f0dba36578ea..f0dba36578ea 100644 --- a/arch/x86_64/lib/csum-copy_64.S +++ b/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 index bc503f506903..bc503f506903 100644 --- a/arch/x86_64/lib/csum-partial_64.c +++ b/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 index fd42a4a095fc..fd42a4a095fc 100644 --- a/arch/x86_64/lib/csum-wrappers_64.c +++ b/arch/x86/lib/csum-wrappers_64.c diff --git a/arch/x86_64/lib/delay_64.c b/arch/x86/lib/delay_64.c index 2dbebd308347..2dbebd308347 100644 --- a/arch/x86_64/lib/delay_64.c +++ b/arch/x86/lib/delay_64.c diff --git a/arch/x86_64/lib/getuser_64.S b/arch/x86/lib/getuser_64.S index 5448876261f8..5448876261f8 100644 --- a/arch/x86_64/lib/getuser_64.S +++ b/arch/x86/lib/getuser_64.S diff --git a/arch/x86_64/lib/io_64.c b/arch/x86/lib/io_64.c index 87b4a4e18039..87b4a4e18039 100644 --- a/arch/x86_64/lib/io_64.c +++ b/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 index 05a95e713da8..05a95e713da8 100644 --- a/arch/x86_64/lib/iomap_copy_64.S +++ b/arch/x86/lib/iomap_copy_64.S diff --git a/arch/x86_64/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index c22981fa2f3a..c22981fa2f3a 100644 --- a/arch/x86_64/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S diff --git a/arch/x86_64/lib/memmove_64.c b/arch/x86/lib/memmove_64.c index 751ebae8ec42..751ebae8ec42 100644 --- a/arch/x86_64/lib/memmove_64.c +++ b/arch/x86/lib/memmove_64.c diff --git a/arch/x86_64/lib/memset_64.S b/arch/x86/lib/memset_64.S index 2c5948116bd2..2c5948116bd2 100644 --- a/arch/x86_64/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S diff --git a/arch/x86_64/lib/putuser_64.S b/arch/x86/lib/putuser_64.S index 4989f5a8fa9b..4989f5a8fa9b 100644 --- a/arch/x86_64/lib/putuser_64.S +++ b/arch/x86/lib/putuser_64.S diff --git a/arch/x86_64/lib/rwlock_64.S b/arch/x86/lib/rwlock_64.S index 0cde1f807314..0cde1f807314 100644 --- a/arch/x86_64/lib/rwlock_64.S +++ b/arch/x86/lib/rwlock_64.S diff --git a/arch/x86_64/lib/thunk_64.S b/arch/x86/lib/thunk_64.S index 55e586d352d3..55e586d352d3 100644 --- a/arch/x86_64/lib/thunk_64.S +++ b/arch/x86/lib/thunk_64.S diff --git a/arch/x86_64/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index 893d43f838cc..893d43f838cc 100644 --- a/arch/x86_64/lib/usercopy_64.c +++ b/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" |