Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4c9dc6412247abf4972080c51cd16a58c4009c19

Authored by Pavel Machek
Committed by Ingo Molnar
1 parent a6fa8e5a61
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

kernel/time/tick-sched.c
Diff comments   View file @ 4c9dc64
... ... @@ -296,7 +296,7 @@
296 296 /* Check, if the timer was already in the past */
297 297 if (hrtimer_active(&ts->sched_timer))
298 298 goto out;
299   - } else if(!tick_program_event(expires, 0))
  299 + } else if (!tick_program_event(expires, 0))
300 300 goto out;
301 301 /*
302 302 * We are past the event already. So we crossed a
... ... @@ -507,7 +507,7 @@
507 507 */
508 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 511 * Called with interrupts disabled and timer->base->cpu_base->lock held.
512 512 */
513 513 static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)
... ... @@ -655,7 +655,7 @@
655 655 int preempt_count = preempt_count();
656 656 fn(data);
657 657 if (preempt_count != preempt_count()) {
658   - printk(KERN_WARNING "huh, entered %p "
  658 + printk(KERN_ERR "huh, entered %p "
659 659 "with preempt_count %08x, exited"
660 660 " with %08x?\n",
661 661 fn, preempt_count,