diff options
| author | Al Viro | 2013-03-05 21:04:55 +0100 |
|---|---|---|
| committer | Al Viro | 2013-03-05 21:14:16 +0100 |
| commit | e1fd1f490fa4213bd3060efa823a39d299538f72 (patch) | |
| tree | 8bed18bdf003822ef1a4946e734418cf88546c24 /ipc/syscall.c | |
| parent | make do_mremap() static (diff) | |
| download | kernel-qcow2-linux-e1fd1f490fa4213bd3060efa823a39d299538f72.tar.gz kernel-qcow2-linux-e1fd1f490fa4213bd3060efa823a39d299538f72.tar.xz kernel-qcow2-linux-e1fd1f490fa4213bd3060efa823a39d299538f72.zip | |
get rid of union semop in sys_semctl(2) arguments
just have the bugger take unsigned long and deal with SETVAL
case (when we use an int member in the union) explicitly.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc/syscall.c')
| -rw-r--r-- | ipc/syscall.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/syscall.c b/ipc/syscall.c index 0d1e32ce048e..52429489cde0 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c @@ -33,12 +33,12 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, case SEMGET: return sys_semget(first, second, third); case SEMCTL: { - union semun fourth; + unsigned long arg; if (!ptr) return -EINVAL; - if (get_user(fourth.__pad, (void __user * __user *) ptr)) + if (get_user(arg, (unsigned long __user *) ptr)) return -EFAULT; - return sys_semctl(first, second, third, fourth); + return sys_semctl(first, second, third, arg); } case MSGSND: |