From: Josh Triplett <josht@us.ibm.com>
Date: Fri, 29 Sep 2006 08:59:36 +0000 (-0700)
Subject: [PATCH] timer: add lock annotation to lock_timer_base
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=89e7e374dde1015d69d2d70797ae4053b14fa9db;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] timer: add lock annotation to lock_timer_base

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/timer.c b/kernel/timer.c
index 1d7dd6267c2d..6c9fa80088ed 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -175,6 +175,7 @@ static inline void detach_timer(struct timer_list *timer,
  */
 static tvec_base_t *lock_timer_base(struct timer_list *timer,
 					unsigned long *flags)
+	__acquires(timer->base->lock)
 {
 	tvec_base_t *base;