From: Viresh Kumar Date: Fri, 28 Feb 2014 08:45:21 +0000 (+0530) Subject: timer: Check failure of timer_cpu_notify() before calling init_timer_stats() X-Git-Tag: v3.15-rc1~153^2~27 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c24a4a369419c360c323865b91198878275c1481;p=karo-tx-linux.git timer: Check failure of timer_cpu_notify() before calling init_timer_stats() timer_cpu_notify() should return NOTIFY_OK and nothing else. Anything else would trigger a BUG_ON(). Return value of this routine is already checked correctly but is done after issuing a call to init_timer_stats(). The right order would be to check the error case first and then call init_timer_stats(). Lets do it. Signed-off-by: Viresh Kumar Cc: linaro-kernel@lists.linaro.org Cc: fweisbec@gmail.com Cc: tj@kernel.org Cc: peterz@infradead.org Link: http://lkml.kernel.org/r/c439f5b6bbc2047e1662f4d523350531425bcf9d.1393576981.git.viresh.kumar@linaro.org Signed-off-by: Thomas Gleixner --- diff --git a/kernel/timer.c b/kernel/timer.c index a71bdfdb51e7..31824ef3eb96 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1681,9 +1681,9 @@ void __init init_timers(void) err = timer_cpu_notify(&timers_nb, (unsigned long)CPU_UP_PREPARE, (void *)(long)smp_processor_id()); - init_timer_stats(); - BUG_ON(err != NOTIFY_OK); + + init_timer_stats(); register_cpu_notifier(&timers_nb); open_softirq(TIMER_SOFTIRQ, run_timer_softirq); }