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*

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index a8cc4e13434c..c90696544176 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -23,12 +23,12 @@ struct restart_block {
                 };
                 /* For futex_wait and futex_wait_requeue_pi */
                 struct {
-                        u32 *uaddr;
+                        u32 __user *uaddr;
                         u32 val;
                         u32 flags;
                         u32 bitset;
                         u64 time;
-                        u32 *uaddr2;
+                        u32 __user *uaddr2;
                 } futex;
                 /* For nanosleep */
                 struct {