diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
commit | 572e432e01c1f7c64ad8375a6e0d935b0e40ebf5 (patch) | |
tree | 57ae4168e9bf4c88a1267f4ec6c96df3789cc9cc /include/linux/futex.h | |
parent | d11ea48aab3b57cc931cc7120603e1c2ffb04302 (diff) | |
parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) |
Merge branch 'master' into upstream
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); |