Merge tag 'pci-v5.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / mm / secretmem.c

diff --git a/mm/secretmem.c b/mm/secretmem.c
index 71fb78f..e3e9590 100644 (file)
--- a/mm/secretmem.c
+++ b/mm/secretmem.c
@@ -144,14 +144,8 @@ static const struct file_operations secretmem_fops = {
        .mmap           = secretmem_mmap,
 };
 
-static bool secretmem_isolate_page(struct page *page, isolate_mode_t mode)
-{
-       return false;
-}
-
-static int secretmem_migratepage(struct address_space *mapping,
-                                struct page *newpage, struct page *page,
-                                enum migrate_mode mode)
+static int secretmem_migrate_folio(struct address_space *mapping,
+               struct folio *dst, struct folio *src, enum migrate_mode mode)
 {
        return -EBUSY;
 }
@@ -165,8 +159,7 @@ static void secretmem_free_folio(struct folio *folio)
 const struct address_space_operations secretmem_aops = {
        .dirty_folio    = noop_dirty_folio,
        .free_folio     = secretmem_free_folio,
-       .migratepage    = secretmem_migratepage,
-       .isolate_page   = secretmem_isolate_page,
+       .migrate_folio  = secretmem_migrate_folio,
 };
 
 static int secretmem_setattr(struct user_namespace *mnt_userns,