From: Josh Triplett <josht@us.ibm.com>

lock_timer_base acquires a lock and returns with that lock held.  Add a
lock annotation to this function so that sparse can check callers for lock
pairing, and so that sparse will not complain about this function since it
intentionally uses the lock in this manner.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/timer.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN kernel/timer.c~timer-add-lock-annotation-to-lock_timer_base kernel/timer.c
--- a/kernel/timer.c~timer-add-lock-annotation-to-lock_timer_base
+++ a/kernel/timer.c
@@ -175,6 +175,7 @@ static inline void detach_timer(struct t
  */
 static tvec_base_t *lock_timer_base(struct timer_list *timer,
 					unsigned long *flags)
+	__acquires(timer->base->lock)
 {
 	tvec_base_t *base;
 
_