From 44f0257fc316ff4b33aa3438dd8d891b7d6d72b9 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:16:33 +0200
Subject: [PATCH] i386: move lib
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/i386/Makefile | 2 +-
arch/{i386 => x86}/lib/Makefile | 2 +-
arch/{i386 => x86}/lib/Makefile_32 | 0
arch/{i386 => x86}/lib/bitops_32.c | 0
arch/{i386 => x86}/lib/checksum_32.S | 0
arch/{i386 => x86}/lib/delay_32.c | 0
arch/{i386 => x86}/lib/getuser_32.S | 0
arch/{i386 => x86}/lib/memcpy_32.c | 0
arch/{i386 => x86}/lib/mmx_32.c | 0
arch/{i386 => x86}/lib/msr-on-cpu.c | 0
arch/{i386 => x86}/lib/putuser_32.S | 0
arch/{i386 => x86}/lib/semaphore_32.S | 0
arch/{i386 => x86}/lib/string_32.c | 0
arch/{i386 => x86}/lib/strstr_32.c | 0
arch/{i386 => x86}/lib/usercopy_32.c | 0
arch/x86_64/lib/Makefile | 2 +-
arch/x86_64/lib/msr-on-cpu.c | 2 +-
17 files changed, 4 insertions(+), 4 deletions(-)
rename arch/{i386 => x86}/lib/Makefile (65%)
rename arch/{i386 => x86}/lib/Makefile_32 (100%)
rename arch/{i386 => x86}/lib/bitops_32.c (100%)
rename arch/{i386 => x86}/lib/checksum_32.S (100%)
rename arch/{i386 => x86}/lib/delay_32.c (100%)
rename arch/{i386 => x86}/lib/getuser_32.S (100%)
rename arch/{i386 => x86}/lib/memcpy_32.c (100%)
rename arch/{i386 => x86}/lib/mmx_32.c (100%)
rename arch/{i386 => x86}/lib/msr-on-cpu.c (100%)
rename arch/{i386 => x86}/lib/putuser_32.S (100%)
rename arch/{i386 => x86}/lib/semaphore_32.S (100%)
rename arch/{i386 => x86}/lib/string_32.c (100%)
rename arch/{i386 => x86}/lib/strstr_32.c (100%)
rename arch/{i386 => x86}/lib/usercopy_32.c (100%)
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
similarity index 65%
rename from arch/i386/lib/Makefile
rename to 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
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 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"
--
2.20.1