summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorHuacai Chen <chenhuacai@loongson.cn>2023-08-30 17:35:54 +0800
committerHuacai Chen <chenhuacai@loongson.cn>2023-08-30 17:35:54 +0800
commit9d1785590bbbb69833eae50c136267fce824515d (patch)
tree2a5fe54f675e201bbf52a307f1fd5bda9ccee996 /mm
parent2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff)
parent0d0bd28c500173bfca78aa840f8f36d261ef1765 (diff)
downloadlinux-stable-9d1785590bbbb69833eae50c136267fce824515d.tar.gz
linux-stable-9d1785590bbbb69833eae50c136267fce824515d.tar.bz2
linux-stable-9d1785590bbbb69833eae50c136267fce824515d.zip
Merge tag 'md-next-20230814-resend' into loongarch-next
LoongArch architecture changes for 6.5 (raid5/6 optimization) depend on the md changes to fix build and work, so merge them to create a base.
Diffstat (limited to 'mm')
-rw-r--r--mm/migrate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index 24baad2571e3..fe6f8d454aff 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -684,7 +684,7 @@ int migrate_folio(struct address_space *mapping, struct folio *dst,
}
EXPORT_SYMBOL(migrate_folio);
-#ifdef CONFIG_BLOCK
+#ifdef CONFIG_BUFFER_HEAD
/* Returns true if all buffers are successfully locked */
static bool buffer_migrate_lock_buffers(struct buffer_head *head,
enum migrate_mode mode)
@@ -837,7 +837,7 @@ int buffer_migrate_folio_norefs(struct address_space *mapping,
return __buffer_migrate_folio(mapping, dst, src, mode, true);
}
EXPORT_SYMBOL_GPL(buffer_migrate_folio_norefs);
-#endif
+#endif /* CONFIG_BUFFER_HEAD */
int filemap_migrate_folio(struct address_space *mapping,
struct folio *dst, struct folio *src, enum migrate_mode mode)