forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* '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*
This commit is contained in:
Linus Torvalds 2010-10-21 14:06:17 -07:00
commit b61f6a57f1
3 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/thread_info.h
View file

@ -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 {