Merge branch 'mm-hotfixes-stable' into mm-stable

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/gup.c b/mm/gup.c
index 90ae44f24870..2860cf4a85e1 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2767,7 +2767,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;