From 7fd8a5ff46278bd0af0dd382478b8d0240f90ea0 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 23 Jun 2005 00:09:09 -0700 Subject: [PATCH] --- yaml --- r: 2922 b: refs/heads/master c: be5b4fbd017d12e0d09ea0528a5839ce2ed2c8c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 +- trunk/kernel/timer.c | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 80bf54b9c424..efc8090fb709 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcd497f99a1ef29a7c5e76142965be77e9dacabd +refs/heads/master: be5b4fbd017d12e0d09ea0528a5839ce2ed2c8c8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index deca041fc364..6ee4515d5a20 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2576,7 +2576,7 @@ void fastcall add_preempt_count(int val) /* * Underflow? */ - BUG_ON(((int)preempt_count() < 0)); + BUG_ON((preempt_count() < 0)); preempt_count() += val; /* * Spinlock count overflowing soon? diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index 1f986c16d89f..51ff917c9590 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -489,10 +489,14 @@ static inline void __run_timers(tvec_base_t *base) detach_timer(timer, 1); spin_unlock_irq(&base->t_base.lock); { - u32 preempt_count = preempt_count(); + int preempt_count = preempt_count(); fn(data); if (preempt_count != preempt_count()) { - printk("huh, entered %p with %08x, exited with %08x?\n", fn, preempt_count, preempt_count()); + printk(KERN_WARNING "huh, entered %p " + "with preempt_count %08x, exited" + " with %08x?\n", + fn, preempt_count, + preempt_count()); BUG(); } }