diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
tree | 2320a92b1aed2c9475e291d75c92616af75e195a /include/linux/futex.h | |
parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'include/linux/futex.h')
-rw-r--r-- | include/linux/futex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/futex.h b/include/linux/futex.h index 34c3a215f2c..d097b5b72bc 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -96,7 +96,8 @@ struct robust_list_head { long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout, u32 __user *uaddr2, u32 val2, u32 val3); -extern int handle_futex_death(u32 __user *uaddr, struct task_struct *curr); +extern int +handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi); #ifdef CONFIG_FUTEX extern void exit_robust_list(struct task_struct *curr); |