diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:26 +0100 |
| commit | 4ec08da02f0fda16fbc8dfa040568facaa576790 (patch) | |
| tree | bbd4e0dd8c71c5c2b9af1cb9d4d43e42cec6020f /arch/x86/mm | |
| parent | f8eeae682166e3b965dcdaf499932f4b63cc5b5d (diff) | |
| download | op-kernel-dev-4ec08da02f0fda16fbc8dfa040568facaa576790.zip op-kernel-dev-4ec08da02f0fda16fbc8dfa040568facaa576790.tar.gz | |
x86: remove the duplicated arch/x86/ia32/mmap32.c
Use mmap_32.c in arch/x86/mm instead
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/Makefile_64 | 2 | ||||
| -rw-r--r-- | arch/x86/mm/mmap_32.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/mm/Makefile_64 b/arch/x86/mm/Makefile_64 index 6bcb479..d18baed 100644 --- a/arch/x86/mm/Makefile_64 +++ b/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/arch/x86/mm/mmap_32.c b/arch/x86/mm/mmap_32.c index d7dd096..d490662 100644 --- a/arch/x86/mm/mmap_32.c +++ b/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 |
