From: Matthew Wilcox <willy@infradead.org>
Date: Sat, 12 Aug 2023 15:56:25 +0000 (+0100)
Subject: mm/memory.c: fix mismerge
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=08dff2810e8feb3096bf5c8242ab1649d1e8b1a4;p=linux.git

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: Matthew Wilcox <willy@infradead.org>
Reported-by: kernel 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: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/memory.c b/mm/memory.c
index 4a7c8be9fe71f..f9c3ad4898231 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5457,7 +5457,7 @@ retry:
 	 * 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;
 
 	/*