diff options
| author | Al Viro | 2012-09-27 03:07:20 +0200 |
|---|---|---|
| committer | Al Viro | 2012-09-27 03:07:20 +0200 |
| commit | 5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a (patch) | |
| tree | 6edb13ed37d842ef0b70d072b94e4c78010f90cf /net/socket.c | |
| parent | close the race in nlmsvc_free_block() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.tar.gz kernel-qcow2-linux-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.tar.xz kernel-qcow2-linux-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.zip | |
Merge remote branch 'origin' into for-next
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index a5471f804d99..edc3c4af9085 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2604,7 +2604,7 @@ static int do_siocgstamp(struct net *net, struct socket *sock, err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv); set_fs(old_fs); if (!err) - err = compat_put_timeval(up, &ktv); + err = compat_put_timeval(&ktv, up); return err; } @@ -2620,7 +2620,7 @@ static int do_siocgstampns(struct net *net, struct socket *sock, err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts); set_fs(old_fs); if (!err) - err = compat_put_timespec(up, &kts); + err = compat_put_timespec(&kts, up); return err; } |