X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fvmstat.c;h=c64d169537bfcfe65fc963b009779de85c9b051a;hb=75ecb1a4d148b274aa9acd1d6ccaca0a4654784e;hp=8faf27e5aa98b8fdaee347963e220febef2f45e9;hpb=1f8a6b658a943b4f04a1fc7b3a420360202c86cd;p=linux-2.6

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 8faf27e5aa..c64d169537 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -10,8 +10,10 @@
  */
 
 #include <linux/mm.h>
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/cpu.h>
+#include <linux/sched.h>
 
 #ifdef CONFIG_VM_EVENT_COUNTERS
 DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
@@ -471,13 +473,13 @@ const struct seq_operations fragmentation_op = {
 #endif
 
 #define TEXTS_FOR_ZONES(xx) TEXT_FOR_DMA(xx) TEXT_FOR_DMA32(xx) xx "_normal", \
-					TEXT_FOR_HIGHMEM(xx)
+					TEXT_FOR_HIGHMEM(xx) xx "_movable",
 
 static const char * const vmstat_text[] = {
 	/* Zoned VM counters */
 	"nr_free_pages",
-	"nr_active",
 	"nr_inactive",
+	"nr_active",
 	"nr_anon_pages",
 	"nr_mapped",
 	"nr_file_pages",