Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree

[linux-2.6-block.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9943e5fd74e622528cf89325dc94fb5bbfd30738..4f5cd974e11a0adbb8a601cc92b9866ab6d67d55 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1437,8 +1437,8 @@ static void vmstat_shepherd(struct work_struct *w)
                if (need_update(cpu) &&
                        cpumask_test_and_clear_cpu(cpu, cpu_stat_off))
 
-                       schedule_delayed_work_on(cpu, &per_cpu(vmstat_work, cpu),
-                               __round_jiffies_relative(sysctl_stat_interval, cpu));
+                       schedule_delayed_work_on(cpu,
+                               &per_cpu(vmstat_work, cpu), 0);
 
        put_online_cpus();
 
@@ -1452,7 +1452,7 @@ static void __init start_shepherd_timer(void)
        int cpu;
 
        for_each_possible_cpu(cpu)
-               INIT_DEFERRABLE_WORK(per_cpu_ptr(&vmstat_work, cpu),
+               INIT_DELAYED_WORK(per_cpu_ptr(&vmstat_work, cpu),
                        vmstat_update);
 
        if (!alloc_cpumask_var(&cpu_stat_off, GFP_KERNEL))