aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time/tick-sched.c4
-rw-r--r--kernel/timer.c2
2 files changed, 3 insertions, 3 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)
diff --git a/kernel/timer.c b/kernel/timer.c
index aadfbc8367f5..23f7ead78fae 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -655,7 +655,7 @@ static inline void __run_timers(struct tvec_base *base)
655 int preempt_count = preempt_count(); 655 int preempt_count = preempt_count();
656 fn(data); 656 fn(data);
657 if (preempt_count != preempt_count()) { 657 if (preempt_count != preempt_count()) {
658 printk(KERN_WARNING "huh, entered %p " 658 printk(KERN_ERR "huh, entered %p "
659 "with preempt_count %08x, exited" 659 "with preempt_count %08x, exited"
660 " with %08x?\n", 660 " with %08x?\n",
661 fn, preempt_count, 661 fn, preempt_count,