Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efc1a3b1 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

nommu: don't need get_unmapped_area() for NOMMU 



get_unmapped_area() is unnecessary for NOMMU as no-one calls it.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 779c1023

include/linux/mm_types.h

+2 −0
Original line number Diff line number Diff line
@@ -205,10 +205,12 @@ struct mm_struct { 
	struct vm_area_struct * mmap;		/* list of VMAs */

	struct rb_root mm_rb;

	struct vm_area_struct * mmap_cache;	/* last find_vma result */

#ifdef CONFIG_MMU

	unsigned long (*get_unmapped_area) (struct file *filp,

				unsigned long addr, unsigned long len,

				unsigned long pgoff, unsigned long flags);

	void (*unmap_area) (struct mm_struct *mm, unsigned long addr);

#endif

	unsigned long mmap_base;		/* base of mmap area */

	unsigned long task_size;		/* size of task vm space */

	unsigned long cached_hole_size; 	/* if non-zero, the largest hole below free_area_cache */

include/linux/sched.h

+5 −2
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ extern int sysctl_max_map_count; 


#include <linux/aio.h>



#ifdef CONFIG_MMU

extern void arch_pick_mmap_layout(struct mm_struct *mm);

extern unsigned long

arch_get_unmapped_area(struct file *, unsigned long, unsigned long,

		       unsigned long, unsigned long);
@@ -386,6 +388,9 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, 
			  unsigned long flags);

extern void arch_unmap_area(struct mm_struct *, unsigned long);

extern void arch_unmap_area_topdown(struct mm_struct *, unsigned long);

#else

static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}

#endif



#if USE_SPLIT_PTLOCKS

/*
@@ -2491,8 +2496,6 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) 


#endif /* CONFIG_SMP */



extern void arch_pick_mmap_layout(struct mm_struct *mm);



#ifdef CONFIG_TRACING

extern void

__trace_special(void *__tr, void *__data,

mm/nommu.c

+0 −21
Original line number Diff line number Diff line
@@ -1760,27 +1760,6 @@ void unmap_mapping_range(struct address_space *mapping, 
}

EXPORT_SYMBOL(unmap_mapping_range);



/*

 * ask for an unmapped area at which to create a mapping on a file

 */

unsigned long get_unmapped_area(struct file *file, unsigned long addr,

				unsigned long len, unsigned long pgoff,

				unsigned long flags)

{

	unsigned long (*get_area)(struct file *, unsigned long, unsigned long,

				  unsigned long, unsigned long);



	get_area = current->mm->get_unmapped_area;

	if (file && file->f_op && file->f_op->get_unmapped_area)

		get_area = file->f_op->get_unmapped_area;



	if (!get_area)

		return -ENOSYS;



	return get_area(file, addr, len, pgoff, flags);

}

EXPORT_SYMBOL(get_unmapped_area);



/*

 * Check that a process has enough memory to allocate a new virtual

 * mapping. 0 means there is enough memory for the allocation to

mm/util.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ char *strndup_user(const char __user *s, long n) 
}

EXPORT_SYMBOL(strndup_user);



#ifndef HAVE_ARCH_PICK_MMAP_LAYOUT

#if defined(CONFIG_MMU) && !defined(HAVE_ARCH_PICK_MMAP_LAYOUT)

void arch_pick_mmap_layout(struct mm_struct *mm)

{

	mm->mmap_base = TASK_UNMAPPED_BASE;