Skip to contentSkip to conversation

kernel/: fix BUG_ON checks for cpu notifier callbacks direct call

PATCH New Akinobu Mita 1 participant 1 message May 29, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel/: fix BUG_ON checks for cpu notifier callbacks direct call

The commit 80b5184cc537718122e036afe7e62d202b70d077 ("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.

---
 kernel/softirq.c |    2 +-
 kernel/timer.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/softirq.c +1 -1
index 825e112..07b4f1b 100644
@@ -850,7 +850,7 @@ static __init int spawn_ksoftirqd(void)
 	void *cpu = (void *)(long)smp_processor_id();
 	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);
 	register_cpu_notifier(&cpu_nfb);
 	return 0;
kernel/timer.c +1 -1
index 2454172..ee305c8 100644
@@ -1717,7 +1717,7 @@ void __init init_timers(void)
 
 	init_timer_stats();
 
-	BUG_ON(err == NOTIFY_BAD);
+	BUG_ON(err != NOTIFY_OK);
 	register_cpu_notifier(&timers_nb);
 	open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
 }
Signature · 1 line
1.6.0.6