OSDN Git Service

mm/memory.c: fix mismerge
authorMatthew Wilcox <willy@infradead.org>
Sat, 12 Aug 2023 15:56:25 +0000 (16:56 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 24 Aug 2023 23:20:16 +0000 (16:20 -0700)
commit08dff2810e8feb3096bf5c8242ab1649d1e8b1a4
treeebd35b238c6f33bbc407dc2a3def82807f304d8f
parenta98460494b16db9c377e55bc13e5407a0eb79fe8
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>
mm/memory.c