x86: remove the duplicated arch/x86/ia32/mmap32.c (4ec08da0) · Commits · e / devices / android_kernel_teracube_2e

arch/x86/ia32/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)

arch/x86/ia32/mmap32.c

deleted100644 → 0

+0 −79

Original line number	Diff line number	Diff line
		/*
		* linux/arch/x86_64/ia32/mm/mmap.c
		*
		* flexible mmap layout support
		*
		* Based on the i386 version which was
		*
		* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
		* All Rights Reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*
		*
		* Started by Ingo Molnar <mingo@elte.hu>
		*/

		#include <linux/personality.h>
		#include <linux/mm.h>
		#include <linux/random.h>
		#include <linux/sched.h>

		/*
		* Top of mmap area (just below the process stack).
		*
		* Leave an at least ~128 MB hole.
		*/
		#define MIN_GAP (128 * 1024 * 1024)
		#define MAX_GAP (TASK_SIZE / 6 * 5)

		static inline unsigned long mmap_base(struct mm_struct *mm)
		{
		unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
		unsigned long random_factor = 0;

		if (current->flags & PF_RANDOMIZE)
		random_factor = get_random_int() % (1024 * 1024);

		if (gap < MIN_GAP)
		gap = MIN_GAP;
		else if (gap > MAX_GAP)
		gap = MAX_GAP;

		return PAGE_ALIGN(TASK_SIZE - gap - random_factor);
		}

		/*
		* This function, called very early during the creation of a new
		* process VM image, sets up which VM layout function to use:
		*/
		void ia32_pick_mmap_layout(struct mm_struct *mm)
		{
		/*
		* Fall back to the standard layout if the personality
		* bit is set, or if the expected stack growth is unlimited:
		*/
		if (sysctl_legacy_va_layout \|\|
		(current->personality & ADDR_COMPAT_LAYOUT) \|\|
		current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
		mm->mmap_base = TASK_UNMAPPED_BASE;
		mm->get_unmapped_area = arch_get_unmapped_area;
		mm->unmap_area = arch_unmap_area;
		} else {
		mm->mmap_base = mmap_base(mm);
		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
		mm->unmap_area = arch_unmap_area_topdown;
		}
		}

arch/x86/mm/Makefile_64

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/mm/mmap_32.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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