---

yaml --- r: 322465 b: refs/heads/master c: ed6fe9d h: refs/heads/master i: 322463: f202676 v: v3
git-mirror · Sep 6, 2012 · 781294c · 781294c
1 parent 57dbd7d
commit 781294c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b716ac728bcc01b1f2a7ed6e437196602237c27
+refs/heads/master: ed6fe9d614fc1bca95eb8c0ccd0e92db00ef9d5d
diff --git a/trunk/net/socket.c b/trunk/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;
 }