ipv6: export IP6_RT_PRIO_* to userland

[~andy/linux] / mm / page-writeback.c

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index e5363f34e0250656c357d965a2e8949577cfb607..830893b2b3c776b07070d7257e771406b388dec8 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1532,7 +1532,6 @@ int dirty_writeback_centisecs_handler(ctl_table *table, int write,
        void __user *buffer, size_t *length, loff_t *ppos)
 {
        proc_dointvec(table, write, buffer, length, ppos);
-       bdi_arm_supers_timer();
        return 0;
 }
 
@@ -1603,10 +1602,18 @@ void writeback_set_ratelimit(void)
 }
 
 static int __cpuinit
-ratelimit_handler(struct notifier_block *self, unsigned long u, void *v)
+ratelimit_handler(struct notifier_block *self, unsigned long action,
+                 void *hcpu)
 {
-       writeback_set_ratelimit();
-       return NOTIFY_DONE;
+
+       switch (action & ~CPU_TASKS_FROZEN) {
+       case CPU_ONLINE:
+       case CPU_DEAD:
+               writeback_set_ratelimit();
+               return NOTIFY_OK;
+       default:
+               return NOTIFY_DONE;
+       }
 }
 
 static struct notifier_block __cpuinitdata ratelimit_nb = {