Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[deliverable/linux.git] / mm / mincore.c

diff --git a/mm/mincore.c b/mm/mincore.c
index 725c809610483c6822d3ffa158820d3ff64da1a6..c8c528b3664195a5373dbe5d1608e7b958a59f75 100644 (file)
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -137,8 +137,11 @@ static void mincore_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                } else { /* pte is a swap entry */
                        swp_entry_t entry = pte_to_swp_entry(pte);
 
-                       if (is_migration_entry(entry)) {
-                               /* migration entries are always uptodate */
+                       if (non_swap_entry(entry)) {
+                               /*
+                                * migration or hwpoison entries are always
+                                * uptodate
+                                */
                                *vec = 1;
                        } else {
 #ifdef CONFIG_SWAP