1 files changed, 18 insertions, 7 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2099904d6cc4..740a16a32c22 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1864,10 +1864,13 @@ void show_free_areas(void)
                 }
         }
 
-        printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
+        printk("Active_anon:%lu active_file:%lu inactive_anon%lu\n"
+                " inactive_file:%lu dirty:%lu writeback:%lu unstable:%lu\n"
                 " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
-                global_page_state(NR_ACTIVE),
-                global_page_state(NR_INACTIVE),
+                global_page_state(NR_ACTIVE_ANON),
+                global_page_state(NR_ACTIVE_FILE),
+                global_page_state(NR_INACTIVE_ANON),
+                global_page_state(NR_INACTIVE_FILE),
                 global_page_state(NR_FILE_DIRTY),
                 global_page_state(NR_WRITEBACK),
                 global_page_state(NR_UNSTABLE_NFS),
@@ -1890,8 +1893,10 @@ void show_free_areas(void)
                         " min:%lukB"
                         " low:%lukB"
                         " high:%lukB"
-                        " active:%lukB"
-                        " inactive:%lukB"
+                        " active_anon:%lukB"
+                        " inactive_anon:%lukB"
+                        " active_file:%lukB"
+                        " inactive_file:%lukB"
                         " present:%lukB"
                         " pages_scanned:%lu"
                         " all_unreclaimable? %s"
@@ -1901,8 +1906,10 @@ void show_free_areas(void)
                         K(zone->pages_min),
                         K(zone->pages_low),
                         K(zone->pages_high),
-                        K(zone_page_state(zone, NR_ACTIVE)),
-                        K(zone_page_state(zone, NR_INACTIVE)),
+                        K(zone_page_state(zone, NR_ACTIVE_ANON)),
+                        K(zone_page_state(zone, NR_INACTIVE_ANON)),
+                        K(zone_page_state(zone, NR_ACTIVE_FILE)),
+                        K(zone_page_state(zone, NR_INACTIVE_FILE)),
                         K(zone->present_pages),
                         zone->pages_scanned,
                         (zone_is_all_unreclaimable(zone) ? "yes" : "no")
@@ -3472,6 +3479,10 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                         INIT_LIST_HEAD(&zone->lru[l].list);
                         zone->lru[l].nr_scan = 0;
                 }
+                zone->recent_rotated[0] = 0;
+                zone->recent_rotated[1] = 0;
+                zone->recent_scanned[0] = 0;
+                zone->recent_scanned[1] = 0;
                 zap_zone_vm_stats(zone);
                 zone->flags = 0;
                 if (!size)