Merge /spare/repo/netdev-2.6 branch 'ieee80211'

[linux-2.6] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 1f986c16d89f22ecac011dd98de7edf932f55b00..f2a11887a72680605bc9af158132a4fd104fbe24 100644 (file)
--- 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();
                                }
                        }
@@ -1593,7 +1597,7 @@ void msleep(unsigned int msecs)
 EXPORT_SYMBOL(msleep);
 
 /**
- * msleep_interruptible - sleep waiting for waitqueue interruptions
+ * msleep_interruptible - sleep waiting for signals
  * @msecs: Time in milliseconds to sleep for
  */
 unsigned long msleep_interruptible(unsigned int msecs)