Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

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

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 490d8c1..45b124e 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -9,7 +9,6 @@
  *             Christoph Lameter <christoph@lameter.com>
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/cpu.h>
@@ -371,7 +370,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);
@@ -465,6 +464,7 @@ static char *vmstat_text[] = {
        "nr_writeback",
        "nr_unstable",
        "nr_bounce",
+       "nr_vmscan_write",
 
 #ifdef CONFIG_NUMA
        "numa_hit",