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

Commit e37609bb authored by Piotr Kwapulinski's avatar Piotr Kwapulinski Committed by Linus Torvalds
Browse files

mm/mmap.c: optimization of do_mmap_pgoff function 



The simple check for zero length memory mapping may be performed
earlier.  So that in case of zero length memory mapping some unnecessary
code is not executed at all.  It does not make the code less readable
and saves some CPU cycles.

Signed-off-by: default avatarPiotr Kwapulinski <kwapulinski.piotr@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93ada579

mm/mmap.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1258,6 +1258,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, 




	*populate = 0;

	*populate = 0;





	if (!len)

		return -EINVAL;



	/*

	/*

	 * Does the application expect PROT_READ to imply PROT_EXEC?

	 * Does the application expect PROT_READ to imply PROT_EXEC?

	 *

	 *
@@ -1268,9 +1271,6 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, 
		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))

		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))

			prot |= PROT_EXEC;

			prot |= PROT_EXEC;





	if (!len)

		return -EINVAL;



	if (!(flags & MAP_FIXED))

	if (!(flags & MAP_FIXED))

		addr = round_hint_to_min(addr);

		addr = round_hint_to_min(addr);