Explorar o código

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>
Pavel Machek %!s(int64=17) %!d(string=hai) anos
pai
achega
4c9dc64122
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 2 2
      kernel/time/tick-sched.c
  2. 1 1
      kernel/timer.c

+ 2 - 2
kernel/time/tick-sched.c

@@ -296,7 +296,7 @@ void tick_nohz_stop_sched_tick(void)
 			/* Check, if the timer was already in the past */
 			/* Check, if the timer was already in the past */
 			if (hrtimer_active(&ts->sched_timer))
 			if (hrtimer_active(&ts->sched_timer))
 				goto out;
 				goto out;
-		} else if(!tick_program_event(expires, 0))
+		} else if (!tick_program_event(expires, 0))
 				goto out;
 				goto out;
 		/*
 		/*
 		 * We are past the event already. So we crossed a
 		 * We are past the event already. So we crossed a
@@ -507,7 +507,7 @@ static inline void tick_nohz_switch_to_nohz(void) { }
  */
  */
 #ifdef CONFIG_HIGH_RES_TIMERS
 #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.
  * Called with interrupts disabled and timer->base->cpu_base->lock held.
  */
  */
 static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)
 static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)

+ 1 - 1
kernel/timer.c

@@ -655,7 +655,7 @@ static inline void __run_timers(struct tvec_base *base)
 				int preempt_count = preempt_count();
 				int preempt_count = preempt_count();
 				fn(data);
 				fn(data);
 				if (preempt_count != preempt_count()) {
 				if (preempt_count != preempt_count()) {
-					printk(KERN_WARNING "huh, entered %p "
+					printk(KERN_ERR "huh, entered %p "
 					       "with preempt_count %08x, exited"
 					       "with preempt_count %08x, exited"
 					       " with %08x?\n",
 					       " with %08x?\n",
 					       fn, preempt_count,
 					       fn, preempt_count,