mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta

[mirror_ubuntu-zesty-kernel.git] / mm / page_owner.c

diff --git a/mm/page_owner.c b/mm/page_owner.c
index ac3d8d129974398cb98bf0bbf2b56207fdc18642..792b56da13d8564f4f6fbab68dcf46297bd13c30 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -143,7 +143,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
                goto err;
 
        /* Print information relevant to grouping pages by mobility */
-       pageblock_mt = get_pfnblock_migratetype(page, pfn);
+       pageblock_mt = get_pageblock_migratetype(page);
        page_mt  = gfpflags_to_migratetype(page_ext->gfp_mask);
        ret += snprintf(kbuf + ret, count - ret,
                        "PFN %lu type %s Block %lu type %s Flags %#lx(%pGp)\n",
@@ -301,6 +301,9 @@ static void init_pages_in_zone(pg_data_t *pgdat, struct zone *zone)
 
                        page = pfn_to_page(pfn);
 
+                       if (page_zone(page) != zone)
+                               continue;
+
                        /*
                         * We are safe to check buddy flag and order, because
                         * this is init stage and only single thread runs.