diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:27:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:27:46 -0800 |
| commit | 7e1fb765c613298d861f80fa18af26df87a4ec19 (patch) | |
| tree | 2c6d499decaf469bcc79a4873557146ead3bef9c /include/linux | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 (diff) | |
| parent | futex: correctly return -EFAULT not -EINVAL (diff) | |
| download | linux-dev-7e1fb765c613298d861f80fa18af26df87a4ec19.tar.xz linux-dev-7e1fb765c613298d861f80fa18af26df87a4ec19.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
futex: correctly return -EFAULT not -EINVAL
lockdep: in_range() fix
lockdep: fix debug_show_all_locks()
sched: style cleanups
futex: fix for futex_wait signal stack corruption
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/thread_info.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 1c4eb41dbd89..9c4ad755d7e5 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -7,12 +7,25 @@ #ifndef _LINUX_THREAD_INFO_H #define _LINUX_THREAD_INFO_H +#include <linux/types.h> + /* - * System call restart block. + * System call restart block. */ struct restart_block { long (*fn)(struct restart_block *); - unsigned long arg0, arg1, arg2, arg3; + union { + struct { + unsigned long arg0, arg1, arg2, arg3; + }; + /* For futex_wait */ + struct { + u32 *uaddr; + u32 val; + u32 flags; + u64 time; + } futex; + }; }; extern long do_no_restart_syscall(struct restart_block *parm); |