1 files changed, 6 insertions, 0 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 348279ff6e51..7c3bd119fcca 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -859,6 +859,10 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
                                 return NULL;
                         }
                 }
+
+                if (pte_devmap(pte))
+                        return NULL;
+
                 print_bad_pte(vma, addr, pte, NULL);
                 return NULL;
         }
@@ -923,6 +927,8 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,
                 }
         }
 
+        if (pmd_devmap(pmd))
+                return NULL;
         if (is_zero_pfn(pfn))
                 return NULL;
         if (unlikely(pfn > highest_memmap_pfn))