2 files changed, 7 insertions, 3 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index deca041fc364..6ee4515d5a20 100644
--- a/kernel/sched.c
+++ b/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/kernel/timer.c b/kernel/timer.c
index 1f986c16d89f..51ff917c9590 100644
--- a/kernel/timer.c
+++ b/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();
                                 }
                         }