Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/mm/hmm.c b/mm/hmm.c
index f2aa63b..3850fb6 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -253,7 +253,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr,
                        cpu_flags = HMM_PFN_VALID;
                        if (is_writable_device_private_entry(entry))
                                cpu_flags |= HMM_PFN_WRITE;
-                       *hmm_pfn = swp_offset(entry) | cpu_flags;
+                       *hmm_pfn = swp_offset_pfn(entry) | cpu_flags;
                        return 0;
                }