diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
| commit | 9a375e93f88269bb770fb2eaa57554c975449c88 (patch) | |
| tree | 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f /kernel/workqueue.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | Merge branch 'master' into upstream (diff) | |
Merge branch 'upstream' into max-sect
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e9e464a90376..880fb415a8f6 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -547,7 +547,7 @@ static void take_over_work(struct workqueue_struct *wq, unsigned int cpu) } /* We're holding the cpucontrol mutex here */ -static int __devinit workqueue_cpu_callback(struct notifier_block *nfb, +static int workqueue_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { |