diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 01:06:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 01:06:17 +0400 |
| commit | b61f6a57f1919ef8dbd33f864df9b8b361c65b11 (patch) | |
| tree | 9341bc1a3f6a8fdcd19f97d5bcf1a658ab7fc92c /include/linux | |
| parent | 0575db881d18a4791013fc93ba756ad08b18fb48 (diff) | |
| parent | fb62db2ba943b1683f1d7181bb2988fce4c60870 (diff) | |
| download | linux-b61f6a57f1919ef8dbd33f864df9b8b361c65b11.tar.xz | |
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*
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/thread_info.h | 4 |
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 { |