diff --git a/[refs] b/[refs] index a3e4dbf7def8..d666be9a602b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3c74c52570c0c4ac90c9a0216de800c39089ba7 +refs/heads/master: 15e408cd6ccc3f4f453d87ccd5bc7a84d59feb96 diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index 45e448a5e440..92a31d4cd564 100644 --- a/trunk/kernel/futex.c +++ b/trunk/kernel/futex.c @@ -1360,6 +1360,7 @@ static int futex_requeue(u32 __user *uaddr1, int fshared, u32 __user *uaddr2, /* The key must be already stored in q->key. */ static inline struct futex_hash_bucket *queue_lock(struct futex_q *q) + __acquires(&hb->lock) { struct futex_hash_bucket *hb; @@ -1373,6 +1374,7 @@ static inline struct futex_hash_bucket *queue_lock(struct futex_q *q) static inline void queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb) + __releases(&hb->lock) { spin_unlock(&hb->lock); drop_futex_key_refs(&q->key); @@ -1391,6 +1393,7 @@ queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb) * an example). */ static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb) + __releases(&hb->lock) { int prio; @@ -1471,6 +1474,7 @@ static int unqueue_me(struct futex_q *q) * and dropped here. */ static void unqueue_me_pi(struct futex_q *q) + __releases(q->lock_ptr) { WARN_ON(plist_node_empty(&q->list)); plist_del(&q->list, &q->list.plist);