---

yaml --- r: 79770 b: refs/heads/master c: 4ec08da h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · 7040b40 · 7040b40
1 parent 4798439
commit 7040b40
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 83 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8eeae682166e3b965dcdaf499932f4b63cc5b5d
+refs/heads/master: 4ec08da02f0fda16fbc8dfa040568facaa576790
diff --git a/trunk/arch/x86/ia32/Makefile b/trunk/arch/x86/ia32/Makefile
@@ -3,8 +3,7 @@
 #
 
 obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \
-	ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o \
-	mmap32.o
+	ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o
 
 sysv-$(CONFIG_SYSVIPC) := ipc32.o
 obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)

diff --git a/trunk/arch/x86/ia32/mmap32.c b/trunk/arch/x86/ia32/mmap32.c
diff --git a/trunk/arch/x86/mm/Makefile_64 b/trunk/arch/x86/mm/Makefile_64
@@ -7,4 +7,4 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA) += numa_64.o
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA) += srat_64.o
-
+obj-$(CONFIG_IA32_EMULATION) += mmap_32.o
diff --git a/trunk/arch/x86/mm/mmap_32.c b/trunk/arch/x86/mm/mmap_32.c
@@ -57,7 +57,11 @@ static inline unsigned long mmap_base(struct mm_struct *mm)
  * This function, called very early during the creation of a new
  * process VM image, sets up which VM layout function to use:
  */
+#ifdef CONFIG_X86_32
 void arch_pick_mmap_layout(struct mm_struct *mm)
+#else
+void ia32_pick_mmap_layout(struct mm_struct *mm)
+#endif
 {
 	/*
 	 * Fall back to the standard layout if the personality