summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-09-26 21:07:20 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-09-26 21:07:20 -0400
commit5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a (patch)
tree6edb13ed37d842ef0b70d072b94e4c78010f90cf /net/socket.c
parentc5aa1e554a20fb3542c62688ae46049c9225a965 (diff)
parent6f0f9b6b3fcfe5e156f20d4f804f0d505c750b3c (diff)
downloadop-kernel-dev-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.zip
op-kernel-dev-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.tar.gz
Merge remote branch 'origin' into for-next
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c
index a5471f8..edc3c4a 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;
}
OpenPOWER on IntegriCloud