mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-20 05:31:15 +00:00
kernel/: convert cpu notifier to return encapsulate errno value
By the previous modification, the cpu notifier can return encapsulate errno value. This converts the cpu notifiers for kernel/*.c Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ad84bb5b98
commit
80b5184cc5
7 changed files with 17 additions and 13 deletions
|
@ -1110,7 +1110,7 @@ static int __devinit workqueue_cpu_callback(struct notifier_block *nfb,
|
|||
unsigned int cpu = (unsigned long)hcpu;
|
||||
struct cpu_workqueue_struct *cwq;
|
||||
struct workqueue_struct *wq;
|
||||
int ret = NOTIFY_OK;
|
||||
int err = 0;
|
||||
|
||||
action &= ~CPU_TASKS_FROZEN;
|
||||
|
||||
|
@ -1124,12 +1124,13 @@ undo:
|
|||
|
||||
switch (action) {
|
||||
case CPU_UP_PREPARE:
|
||||
if (!create_workqueue_thread(cwq, cpu))
|
||||
err = create_workqueue_thread(cwq, cpu);
|
||||
if (!err)
|
||||
break;
|
||||
printk(KERN_ERR "workqueue [%s] for %i failed\n",
|
||||
wq->name, cpu);
|
||||
action = CPU_UP_CANCELED;
|
||||
ret = NOTIFY_BAD;
|
||||
err = -ENOMEM;
|
||||
goto undo;
|
||||
|
||||
case CPU_ONLINE:
|
||||
|
@ -1150,7 +1151,7 @@ undo:
|
|||
cpumask_clear_cpu(cpu, cpu_populated_map);
|
||||
}
|
||||
|
||||
return ret;
|
||||
return notifier_from_errno(err);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue