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

Commit 16650107 authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Ralf Baechle
Browse files

MIPS: Trivial style cleanups in mmap.c 



Fix checkpatch warnings.  Rename arch_get_unmapped_area_foo() to
arch_get_unmapped_area_common().  Make indentations and spacing more
consistent.  Add <linux/compiler.h> for likely/unlikely.

Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Cc: Jian Peng <jipeng2005@gmail.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2506/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent fe0b030c

arch/mips/mm/mmap.c

+25 −23
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * Copyright (C) 2011 Wind River Systems,

 *   written by Ralf Baechle <ralf@linux-mips.org>

 */

#include <linux/compiler.h>

#include <linux/errno.h>

#include <linux/mm.h>

#include <linux/mman.h>
@@ -15,7 +16,6 @@ 
#include <linux/sched.h>



unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */



EXPORT_SYMBOL(shm_align_mask);



/* gap between mmap and stack */
@@ -63,7 +63,7 @@ static inline unsigned long COLOUR_ALIGN_DOWN(unsigned long addr, 


enum mmap_allocation_direction {UP, DOWN};



static unsigned long arch_get_unmapped_area_foo(struct file *filp,

static unsigned long arch_get_unmapped_area_common(struct file *filp,

	unsigned long addr0, unsigned long len, unsigned long pgoff,

	unsigned long flags, enum mmap_allocation_direction dir)

{
@@ -131,12 +131,14 @@ static unsigned long arch_get_unmapped_area_foo(struct file *filp, 
			mm->free_area_cache = mm->mmap_base;

		}



		/* either no address requested or can't fit in requested address hole */

		/*

		 * either no address requested, or the mapping can't fit into

		 * the requested address hole

		 */

		addr = mm->free_area_cache;

		if (do_color_align) {

			unsigned long base =

				COLOUR_ALIGN_DOWN(addr - len, pgoff);



			addr = base + len;

		}
@@ -144,7 +146,7 @@ static unsigned long arch_get_unmapped_area_foo(struct file *filp, 
		if (likely(addr > len)) {

			vma = find_vma(mm, addr - len);

			if (!vma || addr <= vma->vm_start) {

				/* remember the address as a hint for next time */

				/* cache the address as a hint for next time */

				return mm->free_area_cache = addr - len;

			}

		}
@@ -164,7 +166,7 @@ static unsigned long arch_get_unmapped_area_foo(struct file *filp, 
			 */

			vma = find_vma(mm, addr);

			if (likely(!vma || addr + len <= vma->vm_start)) {

				/* remember the address as a hint for next time */

				/* cache the address as a hint for next time */

				return mm->free_area_cache = addr;

			}
@@ -201,7 +203,7 @@ static unsigned long arch_get_unmapped_area_foo(struct file *filp, 
unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr0,

	unsigned long len, unsigned long pgoff, unsigned long flags)

{

	return arch_get_unmapped_area_foo(filp,

	return arch_get_unmapped_area_common(filp,

			addr0, len, pgoff, flags, UP);

}
@@ -213,7 +215,7 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp, 
	unsigned long addr0, unsigned long len, unsigned long pgoff,

	unsigned long flags)

{

	return arch_get_unmapped_area_foo(filp,

	return arch_get_unmapped_area_common(filp,

			addr0, len, pgoff, flags, DOWN);

}