diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2010-06-04 17:15:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:21:45 -0400 |
commit | 9e506f7adce8e6165a104d3d78fddd8ff0cdccf8 (patch) | |
tree | 9ddfd67eec7e8a7dc73fb0ced97cc06e54a35c63 /kernel/timer.c | |
parent | 94b3dd0f7bb393d93e84a173b1df9b8b64c83ac4 (diff) |
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.
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>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 2454172a80d..ee305c8d4e1 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1717,7 +1717,7 @@ void __init init_timers(void) | |||
1717 | 1717 | ||
1718 | init_timer_stats(); | 1718 | init_timer_stats(); |
1719 | 1719 | ||
1720 | BUG_ON(err == NOTIFY_BAD); | 1720 | BUG_ON(err != NOTIFY_OK); |
1721 | register_cpu_notifier(&timers_nb); | 1721 | register_cpu_notifier(&timers_nb); |
1722 | open_softirq(TIMER_SOFTIRQ, run_timer_softirq); | 1722 | open_softirq(TIMER_SOFTIRQ, run_timer_softirq); |
1723 | } | 1723 | } |