summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@infradead.org>2023-08-12 18:56:25 +0300
committerAndrew Morton <akpm@linux-foundation.org>2023-08-25 02:20:16 +0300
commit08dff2810e8feb3096bf5c8242ab1649d1e8b1a4 (patch)
treeebd35b238c6f33bbc407dc2a3def82807f304d8f /mm
parenta98460494b16db9c377e55bc13e5407a0eb79fe8 (diff)
downloadlinux-08dff2810e8feb3096bf5c8242ab1649d1e8b1a4.tar.xz
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 4a7c8be9fe71..f9c3ad489823 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;
/*