mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
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>
This commit is contained in:
parent
a98460494b
commit
08dff2810e
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue