From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 21:06:17 +0000 (-0700)
Subject: Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~193
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=b61f6a57f1919ef8dbd33f864df9b8b361c65b11;p=net-next-2.6.git

Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Fix kernel-doc notation & typos
  futex: Add lock context annotations
  futex: Mark restart_block.futex.uaddr[2] __user
  futex: Change 3rd arg of fetch_robust_entry() to unsigned int*
---

b61f6a57f1919ef8dbd33f864df9b8b361c65b11
diff --cc kernel/futex.c
index e328f574c97,9b9fda73ba2..a118bf160e0
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@@ -1372,8 -1377,10 +1376,9 @@@ static inline struct futex_hash_bucket 
  
  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);
  }
  
  /**