timer cleanups
PATCH 1/1 timer cleanups
Small cleanups to tick-related code. Wrong preempt count is followed by BUG(), so it is hardly KERN_WARNING.
Signed-off-by Pavel Machek <[email protected]>
kernel/time/tick-sched.c +2 -2
@@ -295,7 +295,7 @@ #endif/* Check, if the timer was already in the past */ if (hrtimer_active (&ts->sched_timer)) goto out; - }else if (!tick_program_event (expires,0 )) + }else if (!tick_program_event (expires,0 )) goto out;/* * We are past the event already. So we crossed a
@@ -506,7 +506,7 @@ #endif /* NO_HZ */*/ #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
@@ -657,7 +655,7 @@ static inline void __run_timers(tvec_basint 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",
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html