diff --git a/mm/gup.c b/mm/gup.c
index f773ea191c2e4ded0b5d7f8cf5c51f19134f96ec..cd52cae41bdd61879ddad532cb33e0ed47346c7c 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2669,7 +2669,7 @@ static int gup_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr, unsigned lo
 		next = pud_addr_end(addr, end);
 		if (unlikely(!pud_present(pud)))
 			return 0;
-		if (unlikely(pud_huge(pud))) {
+		if (unlikely(pud_huge(pud) || pud_devmap(pud))) {
 			if (!gup_huge_pud(pud, pudp, addr, next, flags,
 					  pages, nr))
 				return 0;