Commit 08dff281 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Andrew Morton
Browse files

mm/memory.c: fix mismerge 

Fix a build issue.

Link: https://lkml.kernel.org/r/ZNerqcNS4EBJA/2v@casper.infradead.org


Fixes: 4aaa60dad4d1 ("mm: allow per-VMA locks on file-backed VMAs")
Signed-off-by: default avatarMatthew Wilcox <willy@infradead.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202308121909.XNYBtqNI-lkp@intel.com/


Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a9846049

mm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -5457,7 +5457,7 @@ struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm, 
	 * concurrent mremap() with MREMAP_DONTUNMAP could dissociate the VMA

	 * from its anon_vma.

	 */

	if (unlikely(!vma->anon_vma && !vma_is_tcp(vma)))

	if (vma_is_anonymous(vma) && !vma->anon_vma)

		goto inval_end_read;



	/*