Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

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

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9832d9a..c64d169 100644 (file)
--- 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",
@@ -698,7 +700,7 @@ static void __devinit start_cpu_timer(int cpu)
 {
        struct delayed_work *vmstat_work = &per_cpu(vmstat_work, cpu);
 
-       INIT_DELAYED_WORK(vmstat_work, vmstat_update);
+       INIT_DELAYED_WORK_DEFERRABLE(vmstat_work, vmstat_update);
        schedule_delayed_work_on(cpu, vmstat_work, HZ + cpu);
 }