diff options
author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2012-09-18 12:59:23 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-09-18 12:59:23 -0400 |
commit | 9fdf9b73d61c87a9c16f101bb8bbe069d13046f5 (patch) | |
tree | 5b77daceffec6c330f66ac13a1687a986344c817 /kernel/workqueue.c | |
parent | b2eb83d123c1cc9f96a8e452b26a6ebe631b3ad7 (diff) |
workqueue: use __cpuinit instead of __devinit for cpu callbacks
For workqueue hotplug callbacks, it makes less sense to use __devinit
which discards the memory after boot if !HOTPLUG. __cpuinit, which
discards the memory after boot if !HOTPLUG_CPU fits better.
tj: Updated description.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r-- | kernel/workqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e651239f1ece..942bb750a650 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -3548,7 +3548,7 @@ static void gcwq_unbind_fn(struct work_struct *work) | |||
3548 | * Workqueues should be brought up before normal priority CPU notifiers. | 3548 | * Workqueues should be brought up before normal priority CPU notifiers. |
3549 | * This will be registered high priority CPU notifier. | 3549 | * This will be registered high priority CPU notifier. |
3550 | */ | 3550 | */ |
3551 | static int __devinit workqueue_cpu_up_callback(struct notifier_block *nfb, | 3551 | static int __cpuinit workqueue_cpu_up_callback(struct notifier_block *nfb, |
3552 | unsigned long action, | 3552 | unsigned long action, |
3553 | void *hcpu) | 3553 | void *hcpu) |
3554 | { | 3554 | { |
@@ -3589,7 +3589,7 @@ static int __devinit workqueue_cpu_up_callback(struct notifier_block *nfb, | |||
3589 | * Workqueues should be brought down after normal priority CPU notifiers. | 3589 | * Workqueues should be brought down after normal priority CPU notifiers. |
3590 | * This will be registered as low priority CPU notifier. | 3590 | * This will be registered as low priority CPU notifier. |
3591 | */ | 3591 | */ |
3592 | static int __devinit workqueue_cpu_down_callback(struct notifier_block *nfb, | 3592 | static int __cpuinit workqueue_cpu_down_callback(struct notifier_block *nfb, |
3593 | unsigned long action, | 3593 | unsigned long action, |
3594 | void *hcpu) | 3594 | void *hcpu) |
3595 | { | 3595 | { |