bpf: Check IS_ERR for the bpf_map_get() return value

[platform/kernel/linux-starfive.git] / mm / migrate_device.c

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index 721b236..d30c9de 100644 (file)
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -306,7 +306,7 @@ static void migrate_vma_collect(struct migrate_vma *migrate)
         * private page mappings that won't be migrated.
         */
        mmu_notifier_range_init_owner(&range, MMU_NOTIFY_MIGRATE, 0,
-               migrate->vma, migrate->vma->vm_mm, migrate->start, migrate->end,
+               migrate->vma->vm_mm, migrate->start, migrate->end,
                migrate->pgmap_owner);
        mmu_notifier_invalidate_range_start(&range);
 
@@ -388,7 +388,7 @@ static unsigned long migrate_device_unmap(unsigned long *src_pfns,
                                allow_drain = false;
                        }
 
-                       if (isolate_lru_page(page)) {
+                       if (!isolate_lru_page(page)) {
                                src_pfns[i] &= ~MIGRATE_PFN_MIGRATE;
                                restore++;
                                continue;
@@ -733,7 +733,7 @@ static void __migrate_device_pages(unsigned long *src_pfns,
                                notified = true;
 
                                mmu_notifier_range_init_owner(&range,
-                                       MMU_NOTIFY_MIGRATE, 0, migrate->vma,
+                                       MMU_NOTIFY_MIGRATE, 0,
                                        migrate->vma->vm_mm, addr, migrate->end,
                                        migrate->pgmap_owner);
                                mmu_notifier_invalidate_range_start(&range);