kernel/: fix BUG_ON checks for cpu notifier callbacks direct call
The commit 80b5184cc5
("kernel/: convert cpu
notifier to return encapsulate errno value") changed the return value of
cpu notifier callbacks.
Those callbacks don't return NOTIFY_BAD on failures anymore. But there
are a few callbacks which are called directly at init time and checking
the return value.
I forgot to change BUG_ON checking by the direct callers in the commit.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
94b3dd0f7b
Коммит
9e506f7adc
|
@ -850,7 +850,7 @@ static __init int spawn_ksoftirqd(void)
|
||||||
void *cpu = (void *)(long)smp_processor_id();
|
void *cpu = (void *)(long)smp_processor_id();
|
||||||
int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
|
int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
|
||||||
|
|
||||||
BUG_ON(err == NOTIFY_BAD);
|
BUG_ON(err != NOTIFY_OK);
|
||||||
cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
|
cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
|
||||||
register_cpu_notifier(&cpu_nfb);
|
register_cpu_notifier(&cpu_nfb);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -1717,7 +1717,7 @@ void __init init_timers(void)
|
||||||
|
|
||||||
init_timer_stats();
|
init_timer_stats();
|
||||||
|
|
||||||
BUG_ON(err == NOTIFY_BAD);
|
BUG_ON(err != NOTIFY_OK);
|
||||||
register_cpu_notifier(&timers_nb);
|
register_cpu_notifier(&timers_nb);
|
||||||
open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
|
open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче