aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josht@us.ibm.com>2006-09-29 01:59:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:09 -0700
commit89e7e374dde1015d69d2d70797ae4053b14fa9db (patch)
treec6d819506caeec6680be88fccc4ed8e910a25ac9
parent650a898342b3fa21c392c06a2b7010fa19823efa (diff)
downloadlinaro-lsk-89e7e374dde1015d69d2d70797ae4053b14fa9db.tar.gz
[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>
-rw-r--r--kernel/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 1d7dd6267c2..6c9fa80088e 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;