r8169: perform RX config change after mac filtering

[linux-2.6-omap-h63xx.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9832d9a41d8c721129a29f6b235b248b22de05dd..eceaf496210fcf241d55482e9dd317c2a9d5dc56 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -12,6 +12,7 @@
 #include <linux/mm.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}};
@@ -476,8 +477,8 @@ const struct seq_operations fragmentation_op = {
 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 +699,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);
 }