summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorAkinobu Mita <mita@miraclelinux.com>2006-09-29 02:00:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:14 -0700
commit07dccf3344010f9b9df7fe725da7e73bca2992df (patch)
tree696730ef4e1bf85a24eac84713921746f74c7c10 /kernel/timer.c
parent6c2d8b5dcad468cb0bdec3368b53383bde51e487 (diff)
downloadop-kernel-dev-07dccf3344010f9b9df7fe725da7e73bca2992df.zip
op-kernel-dev-07dccf3344010f9b9df7fe725da7e73bca2992df.tar.gz
[PATCH] check return value of cpu_callback
Spawing ksoftirqd, migration, or watchdog, and calling init_timers_cpu() may fail with small memory. If it happens in initcalls, kernel NULL pointer dereference happens later. This patch makes crash happen immediately in such cases. It seems a bit better than getting kernel NULL pointer dereference later. Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index d644f4e..a2cb1ec 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1694,8 +1694,10 @@ static struct notifier_block __cpuinitdata timers_nb = {
void __init init_timers(void)
{
- timer_cpu_notify(&timers_nb, (unsigned long)CPU_UP_PREPARE,
+ int err = timer_cpu_notify(&timers_nb, (unsigned long)CPU_UP_PREPARE,
(void *)(long)smp_processor_id());
+
+ BUG_ON(err == NOTIFY_BAD);
register_cpu_notifier(&timers_nb);
open_softirq(TIMER_SOFTIRQ, run_timer_softirq, NULL);
}
OpenPOWER on IntegriCloud