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

Commit 4944e76d authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] mm: remove implied vm_ops check 



If !vma->vm-ops we already BUG above, so retesting it is useless.  The
compiler cannot optimize this because BUG is a macro and is not thus marked
noreturn; that should possibly be fixed.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d44ed4f8

mm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -1955,7 +1955,7 @@ static int do_file_page(struct mm_struct * mm, struct vm_area_struct * vma, 
	 * Fall back to the linear mapping if the fs does not support

	 * ->populate:

	 */

	if (!vma->vm_ops || !vma->vm_ops->populate || 

	if (!vma->vm_ops->populate ||

			(write_access && !(vma->vm_flags & VM_SHARED))) {

		pte_clear(mm, address, pte);

		return do_no_page(mm, vma, address, write_access, pte, pmd);