Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux-2.6-block.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 084c6725b3734430483e7ea4fcf74e2ab67f7bfa..69ce64f7b8d76de74991638730f825855f7a26d2 100644 (file)
--- 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)
 {
@@ -1133,7 +1120,7 @@ static void pagetypeinfo_showmixedcount(struct seq_file *m, pg_data_t *pgdat)
 #ifdef CONFIG_PAGE_OWNER
        int mtype;
 
-       if (!page_owner_inited)
+       if (!static_branch_unlikely(&page_owner_inited))
                return;
 
        drain_all_pages(NULL);