2.6.25-git19

 mm

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 7c7286e..1a32130 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -322,6 +322,7 @@ void refresh_cpu_vm_stats(int cpu)
             p->expire = 3;
 #endif
          }
+      cond_resched();
 #ifdef CONFIG_NUMA
       /*
        * Deal with draining the remote pageset of this
@@ -364,13 +365,13 @@ void refresh_cpu_vm_stats(int cpu)
  *
  * Must be called with interrupts disabled.
  */
-void zone_statistics(struct zonelist *zonelist, struct zone *z)
+void zone_statistics(struct zone *preferred_zone, struct zone *z)
 {
-   if (z->zone_pgdat == zonelist->zones[0]->zone_pgdat) {
+   if (z->zone_pgdat == preferred_zone->zone_pgdat) {
       __inc_zone_state(z, NUMA_HIT);
    } else {
       __inc_zone_state(z, NUMA_MISS);
-      __inc_zone_state(zonelist->zones[0], NUMA_FOREIGN);
+      __inc_zone_state(preferred_zone, NUMA_FOREIGN);
    }
    if (z->node == numa_node_id())
       __inc_zone_state(z, NUMA_LOCAL);
@@ -547,6 +548,10 @@ static int pagetypeinfo_show(struct seq_file *m, void *arg)
 {
    pg_data_t *pgdat = (pg_data_t *)arg;
 
+   /* check memoryless node */
+   if (!node_state(pgdat->node_id, N_HIGH_MEMORY))
+      return 0;
+
    seq_printf(m, "Page block order: %d\n", pageblock_order);
    seq_printf(m, "Pages per block:  %lu\n", pageblock_nr_pages);
    seq_putc(m, '\n');
@@ -607,6 +612,7 @@ static const char * const vmstat_text[] = {
    "nr_unstable",
    "nr_bounce",
    "nr_vmscan_write",
+   "nr_writeback_temp",
 
 #ifdef CONFIG_NUMA
    "numa_hit",
@@ -645,6 +651,10 @@ static const char * const vmstat_text[] = {
    "allocstall",
 
    "pgrotated",
+#ifdef CONFIG_HUGETLB_PAGE
+   "htlb_buddy_alloc_success",
+   "htlb_buddy_alloc_fail",
+#endif
 #endif
 };