aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2010-09-14 08:43:48 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-09-18 06:19:21 -0400
commit15e408cd6ccc3f4f453d87ccd5bc7a84d59feb96 (patch)
tree4e335e995ed528b74ced48ad1c79175b78ac9e53 /kernel/futex.c
parenta3c74c52570c0c4ac90c9a0216de800c39089ba7 (diff)
futex: Add lock context annotations
queue_lock/unlock/me() and unqueue_me_pi() grab/release spinlocks but are missing proper annotations. Add them. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Darren Hart <dvhltc@us.ibm.com> LKML-Reference: <1284468228-8723-3-git-send-email-namhyung@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 45e448a5e440..92a31d4cd564 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1360,6 +1360,7 @@ out:
1360 1360
1361/* The key must be already stored in q->key. */ 1361/* The key must be already stored in q->key. */
1362static inline struct futex_hash_bucket *queue_lock(struct futex_q *q) 1362static inline struct futex_hash_bucket *queue_lock(struct futex_q *q)
1363 __acquires(&hb->lock)
1363{ 1364{
1364 struct futex_hash_bucket *hb; 1365 struct futex_hash_bucket *hb;
1365 1366
@@ -1373,6 +1374,7 @@ static inline struct futex_hash_bucket *queue_lock(struct futex_q *q)
1373 1374
1374static inline void 1375static inline void
1375queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb) 1376queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb)
1377 __releases(&hb->lock)
1376{ 1378{
1377 spin_unlock(&hb->lock); 1379 spin_unlock(&hb->lock);
1378 drop_futex_key_refs(&q->key); 1380 drop_futex_key_refs(&q->key);
@@ -1391,6 +1393,7 @@ queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb)
1391 * an example). 1393 * an example).
1392 */ 1394 */
1393static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb) 1395static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
1396 __releases(&hb->lock)
1394{ 1397{
1395 int prio; 1398 int prio;
1396 1399
@@ -1471,6 +1474,7 @@ retry:
1471 * and dropped here. 1474 * and dropped here.
1472 */ 1475 */
1473static void unqueue_me_pi(struct futex_q *q) 1476static void unqueue_me_pi(struct futex_q *q)
1477 __releases(q->lock_ptr)
1474{ 1478{
1475 WARN_ON(plist_node_empty(&q->list)); 1479 WARN_ON(plist_node_empty(&q->list));
1476 plist_del(&q->list, &q->list.plist); 1480 plist_del(&q->list, &q->list.plist);