Merge branch 'linus' into perfcounters/core

[~andy/linux] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 672ca25fbc43a9c151f48be2ec6fab222337d357..fed53be44fd92179dd2291ca53dcfb3113591089 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -532,10 +532,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
+ * @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,