| From: Matthew Wilcox <willy@infradead.org> |
| Subject: mm/memory.c: fix mismerge |
| Date: Sat, 12 Aug 2023 16:56:25 +0100 |
| |
| 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> |
| --- |
| |
| mm/memory.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/mm/memory.c~mm-memoryc-fix-mismerge |
| +++ a/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; |
| |
| /* |
| _ |
