3 files changed, 20 insertions, 30 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4e8029a7a4bf..030fafccaa6b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -223,6 +223,19 @@ static char * const zone_names[MAX_NR_ZONES] = {
 #endif
 };
 
+char * const migratetype_names[MIGRATE_TYPES] = {
+        "Unmovable",
+        "Movable",
+        "Reclaimable",
+        "HighAtomic",
+#ifdef CONFIG_CMA
+        "CMA",
+#endif
+#ifdef CONFIG_MEMORY_ISOLATION
+        "Isolate",
+#endif
+};
+
 compound_page_dtor * const compound_page_dtors[] = {
         NULL,
         free_compound_page,
diff --git a/mm/page_owner.c b/mm/page_owner.c
index 983c3a10fa07..7a37a30d941b 100644
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -100,8 +100,9 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
                 return -ENOMEM;
 
         ret = snprintf(kbuf, count,
-                        "Page allocated via order %u, mask 0x%x\n",
-                        page_ext->order, page_ext->gfp_mask);
+                        "Page allocated via order %u, mask %#x(%pGg)\n",
+                        page_ext->order, page_ext->gfp_mask,
+                        &page_ext->gfp_mask);
 
         if (ret >= count)
                 goto err;
@@ -110,23 +111,12 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
         pageblock_mt = get_pfnblock_migratetype(page, pfn);
         page_mt  = gfpflags_to_migratetype(page_ext->gfp_mask);
         ret += snprintf(kbuf + ret, count - ret,
-                        "PFN %lu Block %lu type %d %s Flags %s%s%s%s%s%s%s%s%s%s%s%s\n",
+                        "PFN %lu type %s Block %lu type %s Flags %#lx(%pGp)\n",
                         pfn,
+                        migratetype_names[page_mt],
                         pfn >> pageblock_order,
-                        pageblock_mt,
-                        pageblock_mt != page_mt ? "Fallback" : "        ",
-                        PageLocked(page)        ? "K" : " ",
-                        PageError(page)         ? "E" : " ",
-                        PageReferenced(page)    ? "R" : " ",
-                        PageUptodate(page)      ? "U" : " ",
-                        PageDirty(page)         ? "D" : " ",
-                        PageLRU(page)           ? "L" : " ",
-                        PageActive(page)        ? "A" : " ",
-                        PageSlab(page)          ? "S" : " ",
-                        PageWriteback(page)     ? "W" : " ",
-                        PageCompound(page)      ? "C" : " ",
-                        PageSwapCache(page)     ? "B" : " ",
-                        PageMappedToDisk(page)  ? "M" : " ");
+                        migratetype_names[pageblock_mt],
+                        page->flags, &page->flags);
 
         if (ret >= count)
                 goto err;
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 084c6725b373..72c17981cb70 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -924,19 +924,6 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
 #endif
 
 #ifdef CONFIG_PROC_FS
-static char * const migratetype_names[MIGRATE_TYPES] = {
-        "Unmovable",
-        "Movable",
-        "Reclaimable",
-        "HighAtomic",
-#ifdef CONFIG_CMA
-        "CMA",
-#endif
-#ifdef CONFIG_MEMORY_ISOLATION
-        "Isolate",
-#endif
-};
-
 static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
                                                 struct zone *zone)
 {