From 781294c7e27a39bf1e15cda55639fc3d0a563119 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Sat, 1 Sep 2012 12:34:07 -0400 Subject: [PATCH] --- yaml --- r: 322465 b: refs/heads/master c: ed6fe9d614fc1bca95eb8c0ccd0e92db00ef9d5d h: refs/heads/master i: 322463: f202676711ad7a82f7408dad02ab9511c26ed96e v: v3 --- [refs] | 2 +- trunk/net/socket.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6a3b68ba2f2e..8a1c98dc9864 100644 --- 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 index a5471f804d99..edc3c4af9085 100644 --- 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; }