Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c9dc641 authored by Pavel Machek's avatar Pavel Machek Committed by Ingo Molnar
Browse files

time: timer cleanups 



Small cleanups to tick-related code. Wrong preempt count is followed
by BUG(), so it is hardly KERN_WARNING.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a6fa8e5a

kernel/time/tick-sched.c

+2 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static inline void tick_nohz_switch_to_nohz(void) { } 
 */

#ifdef CONFIG_HIGH_RES_TIMERS

/*

 * We rearm the timer until we get disabled by the idle code

 * We rearm the timer until we get disabled by the idle code.

 * Called with interrupts disabled and timer->base->cpu_base->lock held.

 */

static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)

kernel/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static inline void __run_timers(struct tvec_base *base) 
				int preempt_count = preempt_count();

				fn(data);

				if (preempt_count != preempt_count()) {

					printk(KERN_WARNING "huh, entered %p "

					printk(KERN_ERR "huh, entered %p "

					       "with preempt_count %08x, exited"

					       " with %08x?\n",

					       fn, preempt_count,