summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:13:49 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:13:49 +0200
commit0b690a40d30ff6924953888d43ab8e90d401fcc7 (patch)
tree2b29aca6502753da3b38857cf59339a3cf645010 /arch
parenti386: prepare shared mm/init.c (diff)
downloadlinux-0b690a40d30ff6924953888d43ab8e90d401fcc7.tar.xz
linux-0b690a40d30ff6924953888d43ab8e90d401fcc7.zip
i386: prepare shared mm/mmap.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/mm/Makefile2
-rw-r--r--arch/i386/mm/mmap_32.c (renamed from arch/i386/mm/mmap.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/Makefile b/arch/i386/mm/Makefile
index fb0a4f3bbdf8..969769a036c5 100644
--- a/arch/i386/mm/Makefile
+++ b/arch/i386/mm/Makefile
@@ -2,7 +2,7 @@
# Makefile for the linux i386-specific parts of the memory manager.
#
-obj-y := init_32.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap.o
+obj-y := init_32.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap_32.o
obj-$(CONFIG_NUMA) += discontig_32.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/arch/i386/mm/mmap.c b/arch/i386/mm/mmap_32.c
index 552e08473755..552e08473755 100644
--- a/arch/i386/mm/mmap.c
+++ b/arch/i386/mm/mmap_32.c