commit ad757b6aa5801b81dec609d87753604a06313c53
author Thomas Gleixner <tglx@linutronix.de> Thu Oct 11 11:16:47 2007 +0200
committer Thomas Gleixner <tglx@linutronix.de> Thu Oct 11 11:16:47 2007 +0200
tree 7bb40460e1729ad370b5ae75e65f9e6a0e824328
parent 96ae6ea0be1b902c28b3b463c27da42b41e2b63a

i386: move mm

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

arch/i386/Makefile

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 776d8dc..cbdc14f 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -103,7 +103,7 @@
 
 libs-y 					+= arch/x86/lib/
 core-y					+= arch/i386/kernel/ \
-					   arch/i386/mm/ \
+					   arch/x86/mm/ \
 					   $(mcore-y)/ \
 					   arch/x86/crypto/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/x86/math-emu/

arch/x86/mm/Makefile

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

arch/x86/mm/Makefile_32

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

arch/x86/mm/boot_ioremap_32.c

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

arch/x86/mm/discontig_32.c

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

arch/x86/mm/extable_32.c

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

arch/x86/mm/fault_32.c

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

arch/x86/mm/highmem_32.c

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

arch/x86/mm/hugetlbpage.c

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

arch/x86/mm/init_32.c

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

arch/x86/mm/ioremap_32.c

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

arch/x86/mm/mmap_32.c

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

arch/x86/mm/pageattr_32.c

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

arch/x86/mm/pgtable_32.c

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

arch/x86_64/mm/Makefile

diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
index 4042f85..7317648 100644
--- a/arch/x86_64/mm/Makefile
+++ b/arch/x86_64/mm/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/mm/Makefile_32
+include ${srctree}/arch/x86/mm/Makefile_32
 else
 include ${srctree}/arch/x86_64/mm/Makefile_64
 endif

arch/x86_64/mm/Makefile_64

diff --git a/arch/x86_64/mm/Makefile_64 b/arch/x86_64/mm/Makefile_64
index 2e20988..5c2883c 100644
--- a/arch/x86_64/mm/Makefile_64
+++ b/arch/x86_64/mm/Makefile_64
@@ -8,4 +8,4 @@
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA) += srat_64.o
 
-hugetlbpage-y = ../../i386/mm/hugetlbpage.o
+hugetlbpage-y = ../../x86/mm/hugetlbpage.o