i386: move lib

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index fe374b6..93492b3 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -101,7 +101,7 @@ mflags-y += -Iinclude/asm-i386/mach-default
 
 head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
 
-libs-y                                         += arch/i386/lib/
+libs-y                                         += arch/x86/lib/
 core-y                                 += arch/i386/kernel/ \
                                           arch/i386/mm/ \
                                           $(mcore-y)/ \

diff --git a/arch/i386/lib/Makefile b/arch/x86/lib/Makefile
similarity index 65%
rename from arch/i386/lib/Makefile
rename to arch/x86/lib/Makefile
index 2b1547e..2d7d724 100644 (file)
--- a/arch/i386/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/lib/Makefile_32
+include ${srctree}/arch/x86/lib/Makefile_32
 else
 include ${srctree}/arch/x86_64/lib/Makefile_64
 endif

diff --git a/arch/i386/lib/Makefile_32 b/arch/x86/lib/Makefile_32
similarity index 100%
rename from arch/i386/lib/Makefile_32
rename to arch/x86/lib/Makefile_32

diff --git a/arch/i386/lib/bitops_32.c b/arch/x86/lib/bitops_32.c
similarity index 100%
rename from arch/i386/lib/bitops_32.c
rename to arch/x86/lib/bitops_32.c

diff --git a/arch/i386/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
similarity index 100%
rename from arch/i386/lib/checksum_32.S
rename to arch/x86/lib/checksum_32.S

diff --git a/arch/i386/lib/delay_32.c b/arch/x86/lib/delay_32.c
similarity index 100%
rename from arch/i386/lib/delay_32.c
rename to arch/x86/lib/delay_32.c

diff --git a/arch/i386/lib/getuser_32.S b/arch/x86/lib/getuser_32.S
similarity index 100%
rename from arch/i386/lib/getuser_32.S
rename to arch/x86/lib/getuser_32.S

diff --git a/arch/i386/lib/memcpy_32.c b/arch/x86/lib/memcpy_32.c
similarity index 100%
rename from arch/i386/lib/memcpy_32.c
rename to arch/x86/lib/memcpy_32.c

diff --git a/arch/i386/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
similarity index 100%
rename from arch/i386/lib/mmx_32.c
rename to arch/x86/lib/mmx_32.c

diff --git a/arch/i386/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c
similarity index 100%
rename from arch/i386/lib/msr-on-cpu.c
rename to arch/x86/lib/msr-on-cpu.c

diff --git a/arch/i386/lib/putuser_32.S b/arch/x86/lib/putuser_32.S
similarity index 100%
rename from arch/i386/lib/putuser_32.S
rename to arch/x86/lib/putuser_32.S

diff --git a/arch/i386/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
similarity index 100%
rename from arch/i386/lib/semaphore_32.S
rename to arch/x86/lib/semaphore_32.S

diff --git a/arch/i386/lib/string_32.c b/arch/x86/lib/string_32.c
similarity index 100%
rename from arch/i386/lib/string_32.c
rename to arch/x86/lib/string_32.c

diff --git a/arch/i386/lib/strstr_32.c b/arch/x86/lib/strstr_32.c
similarity index 100%
rename from arch/i386/lib/strstr_32.c
rename to arch/x86/lib/strstr_32.c

diff --git a/arch/i386/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
similarity index 100%
rename from arch/i386/lib/usercopy_32.c
rename to arch/x86/lib/usercopy_32.c

diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 2b1547e..2d7d724 100644 (file)
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/lib/Makefile_32
+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
index 47e0ec4..5672d41 100644 (file)
--- a/arch/x86_64/lib/msr-on-cpu.c
+++ b/arch/x86_64/lib/msr-on-cpu.c
@@ -1 +1 @@
-#include "../../i386/lib/msr-on-cpu.c"
+#include "../../x86/lib/msr-on-cpu.c"