PCI / PM: Always check PME wakeup capability for runtime wakeup support

[mirror_ubuntu-artful-kernel.git] / mm / pagewalk.c

diff --git a/mm/pagewalk.c b/mm/pagewalk.c
index 1a41979654150f05514cd25f0da685fe397f1104..7d973f63088cb550186d498de8ca0bcc5e580273 100644 (file)
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
@@ -187,8 +187,12 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end,
        do {
                next = hugetlb_entry_end(h, addr, end);
                pte = huge_pte_offset(walk->mm, addr & hmask, sz);
-               if (pte && walk->hugetlb_entry)
+
+               if (pte)
                        err = walk->hugetlb_entry(pte, hmask, addr, next, walk);
+               else if (walk->pte_hole)
+                       err = walk->pte_hole(addr, next, walk);
+
                if (err)
                        break;
        } while (addr = next, addr != end);