x86: unify ioremap_32 and _64

Unify the now identical ioremap_32.c and ioremap_64.c into the same ioremap.c file. No code changed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · Jan 30, 2008 · e64c8aa · e64c8aa
1 parent 240d3a7
commit e64c8aa
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 465 deletions.
diff --git a/arch/x86/mm/Makefile_32 b/arch/x86/mm/Makefile_32
@@ -2,7 +2,7 @@
 # Makefile for the linux i386-specific parts of the memory manager.
 #
 
-obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap_32.o extable.o pageattr.o mmap.o
+obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap.o extable.o pageattr.o mmap.o
 
 obj-$(CONFIG_CPA_DEBUG) += pageattr-test.o
 obj-$(CONFIG_NUMA) += discontig_32.o

diff --git a/arch/x86/mm/Makefile_64 b/arch/x86/mm/Makefile_64
@@ -2,7 +2,7 @@
 # Makefile for the linux x86_64-specific parts of the memory manager.
 #
 
-obj-y	 := init_64.o fault_64.o ioremap_64.o extable.o pageattr.o mmap.o
+obj-y	 := init_64.o fault_64.o ioremap.o extable.o pageattr.o mmap.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA) += numa_64.o
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o

diff --git a/arch/x86/mm/ioremap_32.c → arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap_32.c → arch/x86/mm/ioremap.c