aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2008-01-30 07:30:00 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:00 -0500
commit4c9dc6412247abf4972080c51cd16a58c4009c19 (patch)
treea6c9b22da4ff5537219c03fbbfc919b95a27df2a /kernel/time
parenta6fa8e5a6172a5a5bc06ed04f34e50b36c978127 (diff)
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: Pavel Machek <pavel@suse.cz> Cc: john stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-sched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 1a21b6fdb674..d36ee2fd1a3b 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -296,7 +296,7 @@ void tick_nohz_stop_sched_tick(void)
296 /* Check, if the timer was already in the past */ 296 /* Check, if the timer was already in the past */
297 if (hrtimer_active(&ts->sched_timer)) 297 if (hrtimer_active(&ts->sched_timer))
298 goto out; 298 goto out;
299 } else if(!tick_program_event(expires, 0)) 299 } else if (!tick_program_event(expires, 0))
300 goto out; 300 goto out;
301 /* 301 /*
302 * We are past the event already. So we crossed a 302 * We are past the event already. So we crossed a
@@ -507,7 +507,7 @@ static inline void tick_nohz_switch_to_nohz(void) { }
507 */ 507 */
508#ifdef CONFIG_HIGH_RES_TIMERS 508#ifdef CONFIG_HIGH_RES_TIMERS
509/* 509/*
510 * We rearm the timer until we get disabled by the idle code 510 * We rearm the timer until we get disabled by the idle code.
511 * Called with interrupts disabled and timer->base->cpu_base->lock held. 511 * Called with interrupts disabled and timer->base->cpu_base->lock held.
512 */ 512 */
513static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer) 513static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)