summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:12 +0200
commitb2110a17787f1eb6a60f52e12b119d2ef3013bc2 (patch)
treee2c46d1f3031cb2fa2a81eb277274bd85cc8c5f0 /arch
parentx86_64: prepare shared mm/init.c (diff)
downloadlinux-b2110a17787f1eb6a60f52e12b119d2ef3013bc2.tar.xz
linux-b2110a17787f1eb6a60f52e12b119d2ef3013bc2.zip
x86_64: 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/x86_64/mm/Makefile2
-rw-r--r--arch/x86_64/mm/mmap_64.c (renamed from arch/x86_64/mm/mmap.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
index 1e2ccf009d4c..a7fedc9cbb05 100644
--- a/arch/x86_64/mm/Makefile
+++ b/arch/x86_64/mm/Makefile
@@ -2,7 +2,7 @@
# Makefile for the linux x86_64-specific parts of the memory manager.
#
-obj-y := init_64.o fault.o ioremap_64.o extable.o pageattr.o mmap.o
+obj-y := init_64.o fault.o ioremap_64.o extable.o pageattr.o mmap_64.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_NUMA) += numa.o
obj-$(CONFIG_K8_NUMA) += k8topology.o
diff --git a/arch/x86_64/mm/mmap.c b/arch/x86_64/mm/mmap_64.c
index 80bba0dc000e..80bba0dc000e 100644
--- a/arch/x86_64/mm/mmap.c
+++ b/arch/x86_64/mm/mmap_64.c