Fix "can not" in Documentation and Kconfig

[pandora-kernel.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 04a9093..a2b6a9f 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -321,6 +321,9 @@ void refresh_cpu_vm_stats(int cpu)
        for_each_zone(zone) {
                struct per_cpu_pageset *pcp;
 
+               if (!populated_zone(zone))
+                       continue;
+
                pcp = zone_pcp(zone, cpu);
 
                for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
@@ -368,7 +371,7 @@ void zone_statistics(struct zonelist *zonelist, struct zone *z)
                __inc_zone_state(z, NUMA_MISS);
                __inc_zone_state(zonelist->zones[0], NUMA_FOREIGN);
        }
-       if (z->zone_pgdat == NODE_DATA(numa_node_id()))
+       if (z->node == numa_node_id())
                __inc_zone_state(z, NUMA_LOCAL);
        else
                __inc_zone_state(z, NUMA_OTHER);
@@ -455,12 +458,14 @@ static char *vmstat_text[] = {
        "nr_anon_pages",
        "nr_mapped",
        "nr_file_pages",
-       "nr_slab",
+       "nr_slab_reclaimable",
+       "nr_slab_unreclaimable",
        "nr_page_table_pages",
        "nr_dirty",
        "nr_writeback",
        "nr_unstable",
        "nr_bounce",
+       "nr_vmscan_write",
 
 #ifdef CONFIG_NUMA
        "numa_hit",