Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'timers-fixes-for...

[linux-2.6.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index b4555568b4e4ad16f34a887eabed6f21e05abfba..cffffad01c31cf1670490f2860f0e5de0f25d301 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -531,10 +531,13 @@ static void __init_timer(struct timer_list *timer,
 }
 
 /**
 }
 
 /**

- * init_timer - initialize a timer.
+ * init_timer_key - initialize a timer

  * @timer: the timer to be initialized
  * @timer: the timer to be initialized

+ * @name: name of the timer
+ * @key: lockdep class key of the fake lock used for tracking timer
+ *       sync lock dependencies

  *
  *

- * init_timer() must be done to a timer prior calling *any* of the
+ * init_timer_key() must be done to a timer prior calling *any* of the

  * other timer functions.
  */
 void init_timer_key(struct timer_list *timer,
  * other timer functions.
  */
 void init_timer_key(struct timer_list *timer,