Commit c24a4a36 authored Feb 28, 2014 by Viresh Kumar Committed by Thomas Gleixner Mar 04, 2014

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 <viresh.kumar@linaro.org>
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 <tglx@linutronix.de>

parent bce19369

kernel/timer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message