diff options
author | Tejun Heo <tj@kernel.org> | 2012-08-21 16:18:23 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-08-21 16:18:23 -0400 |
commit | 203b42f7317494ae5e5efc7be6fb7f29c927f102 (patch) | |
tree | 5636bc6da58284977678e0d2c2accc2573260a53 /mm | |
parent | ee64e7f697ad7e5575e6ac8900cfb71975484421 (diff) |
workqueue: make deferrable delayed_work initializer names consistent
Initalizers for deferrable delayed_work are confused.
* __DEFERRED_WORK_INITIALIZER()
* DECLARE_DEFERRED_WORK()
* INIT_DELAYED_WORK_DEFERRABLE()
Rename them to
* __DEFERRABLE_WORK_INITIALIZER()
* DECLARE_DEFERRABLE_WORK()
* INIT_DEFERRABLE_WORK()
This patch doesn't cause any functional changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slab.c | 2 | ||||
-rw-r--r-- | mm/vmstat.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -900,7 +900,7 @@ static void __cpuinit start_cpu_timer(int cpu) | |||
900 | */ | 900 | */ |
901 | if (keventd_up() && reap_work->work.func == NULL) { | 901 | if (keventd_up() && reap_work->work.func == NULL) { |
902 | init_reap_node(cpu); | 902 | init_reap_node(cpu); |
903 | INIT_DELAYED_WORK_DEFERRABLE(reap_work, cache_reap); | 903 | INIT_DEFERRABLE_WORK(reap_work, cache_reap); |
904 | schedule_delayed_work_on(cpu, reap_work, | 904 | schedule_delayed_work_on(cpu, reap_work, |
905 | __round_jiffies_relative(HZ, cpu)); | 905 | __round_jiffies_relative(HZ, cpu)); |
906 | } | 906 | } |
diff --git a/mm/vmstat.c b/mm/vmstat.c index df7a6748231d..b3e3b9d525d0 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
@@ -1157,7 +1157,7 @@ static void __cpuinit start_cpu_timer(int cpu) | |||
1157 | { | 1157 | { |
1158 | struct delayed_work *work = &per_cpu(vmstat_work, cpu); | 1158 | struct delayed_work *work = &per_cpu(vmstat_work, cpu); |
1159 | 1159 | ||
1160 | INIT_DELAYED_WORK_DEFERRABLE(work, vmstat_update); | 1160 | INIT_DEFERRABLE_WORK(work, vmstat_update); |
1161 | schedule_delayed_work_on(cpu, work, __round_jiffies_relative(HZ, cpu)); | 1161 | schedule_delayed_work_on(cpu, work, __round_jiffies_relative(HZ, cpu)); |
1162 | } | 1162 | } |
1163 | 1163 | ||