diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
| commit | 423ab71a8bd2345f87724abe320092a3a516b0bb (patch) | |
| tree | 5d5eb306001e4341c3c073777f4d0b9e05ccd454 /arch/s390/kernel/sys_s390.c | |
| parent | b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00 (diff) | |
| parent | 63f716b9419420defb3e550a1e5f526c11b2ed2d (diff) | |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'arch/s390/kernel/sys_s390.c')
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 6a63553493c..e351780bb66 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -122,8 +122,8 @@ out: #ifndef CONFIG_64BIT struct sel_arg_struct { unsigned long n; - fd_set *inp, *outp, *exp; - struct timeval *tvp; + fd_set __user *inp, *outp, *exp; + struct timeval __user *tvp; }; asmlinkage long old_select(struct sel_arg_struct __user *arg) |