17 files changed, 4 insertions, 4 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index fe374b65430..93492b37061 100644
--- 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
index 2b1547e0ac6..2d7d724a2a6 100644
--- 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
index 98d1f1e2e2e..98d1f1e2e2e 100644
--- a/arch/i386/lib/Makefile_32
+++ b/arch/x86/lib/Makefile_32
diff --git a/arch/i386/lib/bitops_32.c b/arch/x86/lib/bitops_32.c
index afd0045595d..afd0045595d 100644
--- a/arch/i386/lib/bitops_32.c
+++ b/arch/x86/lib/bitops_32.c
diff --git a/arch/i386/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
index adbccd0bbb7..adbccd0bbb7 100644
--- a/arch/i386/lib/checksum_32.S
+++ b/arch/x86/lib/checksum_32.S
diff --git a/arch/i386/lib/delay_32.c b/arch/x86/lib/delay_32.c
index f6edb11364d..f6edb11364d 100644
--- a/arch/i386/lib/delay_32.c
+++ b/arch/x86/lib/delay_32.c
diff --git a/arch/i386/lib/getuser_32.S b/arch/x86/lib/getuser_32.S
index 6d84b53f12a..6d84b53f12a 100644
--- a/arch/i386/lib/getuser_32.S
+++ b/arch/x86/lib/getuser_32.S
diff --git a/arch/i386/lib/memcpy_32.c b/arch/x86/lib/memcpy_32.c
index 8ac51b82a63..8ac51b82a63 100644
--- a/arch/i386/lib/memcpy_32.c
+++ b/arch/x86/lib/memcpy_32.c
diff --git a/arch/i386/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
index 28084d2e8dd..28084d2e8dd 100644
--- a/arch/i386/lib/mmx_32.c
+++ b/arch/x86/lib/mmx_32.c
diff --git a/arch/i386/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c
index 7767962f25d..7767962f25d 100644
--- a/arch/i386/lib/msr-on-cpu.c
+++ b/arch/x86/lib/msr-on-cpu.c
diff --git a/arch/i386/lib/putuser_32.S b/arch/x86/lib/putuser_32.S
index f58fba109d1..f58fba109d1 100644
--- a/arch/i386/lib/putuser_32.S
+++ b/arch/x86/lib/putuser_32.S
diff --git a/arch/i386/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index c01eb39c0b4..c01eb39c0b4 100644
--- a/arch/i386/lib/semaphore_32.S
+++ b/arch/x86/lib/semaphore_32.S
diff --git a/arch/i386/lib/string_32.c b/arch/x86/lib/string_32.c
index 2c773fefa3d..2c773fefa3d 100644
--- a/arch/i386/lib/string_32.c
+++ b/arch/x86/lib/string_32.c
diff --git a/arch/i386/lib/strstr_32.c b/arch/x86/lib/strstr_32.c
index a3dafbf59da..a3dafbf59da 100644
--- a/arch/i386/lib/strstr_32.c
+++ b/arch/x86/lib/strstr_32.c
diff --git a/arch/i386/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index 9f38b12b4af..9f38b12b4af 100644
--- a/arch/i386/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 2b1547e0ac6..2d7d724a2a6 100644
--- 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 47e0ec47c37..5672d4190fb 100644
--- 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"