NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: mm/memory.c: fix mismerge

Browse source 
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>
(cherry picked from commit 08dff2810e8feb3096bf5c8242ab1649d1e8b1a4)

Bug: 293665307
Change-Id: I07ce19f29c44831cdcf709fe1ce122d1963f0be2
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
This commit is contained in:
Matthew Wilcox 2023-08-12 16:56:25 +01:00 • committed by Suren Baghdasaryan
parent 7d50253c27
commit 9c4bc457ab
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mm/memory.c
View file

@ -5514,7 +5514,7 @@ retry:
* concurrent mremap() with MREMAP_DONTUNMAP could dissociate the VMA * concurrent mremap() with MREMAP_DONTUNMAP could dissociate the VMA
* from its anon_vma. * from its anon_vma.
*/ */
if (unlikely(!vma->anon_vma)) if (vma_is_anonymous(vma) && !vma->anon_vma)
goto inval_end_read; goto inval_end_read;
/* Check since vm_start/vm_end might change before we lock the VMA */ /* Check since vm_start/vm_end might change before we lock the VMA */