diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
| commit | 02b311bce9fc87987a123adc3e6a2d0a2caa70e2 (patch) | |
| tree | ba5c42ecf98de1a1a72f4bd5d94dc729ca8196c9 /include/linux/futex.h | |
| parent | 8f0f850e240df5bea027caeb1723142c50e37e57 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' 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 34c3a215f2cd..d097b5b72bc6 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h | |||
| @@ -96,7 +96,8 @@ struct robust_list_head { | |||
| 96 | long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout, | 96 | long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout, |
| 97 | u32 __user *uaddr2, u32 val2, u32 val3); | 97 | u32 __user *uaddr2, u32 val2, u32 val3); |
| 98 | 98 | ||
| 99 | extern int handle_futex_death(u32 __user *uaddr, struct task_struct *curr); | 99 | extern int |
| 100 | handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi); | ||
| 100 | 101 | ||
| 101 | #ifdef CONFIG_FUTEX | 102 | #ifdef CONFIG_FUTEX |
| 102 | extern void exit_robust_list(struct task_struct *curr); | 103 | extern void exit_robust_list(struct task_struct *curr); |