Merge tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / mm / page_owner.c

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 60634dc53a885debd78878692f806c93883cbfff..0fd9dcf2c5dc158789831e0309d1fa66968b9205 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -281,7 +281,11 @@ void pagetypeinfo_showmixedcount_print(struct seq_file *m,
                                continue;
 
                        if (PageBuddy(page)) {
-                               pfn += (1UL << page_order(page)) - 1;
+                               unsigned long freepage_order;
+
+                               freepage_order = page_order_unsafe(page);
+                               if (freepage_order < MAX_ORDER)
+                                       pfn += (1UL << freepage_order) - 1;
                                continue;
                        }