openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: fix sparc64 compilation of sock_gettstamp 

net/core/sock.c: In function 'sock_gettstamp':
net/core/sock.c:3007:23: error: expected '}' before ';' token
    .tv_sec = ts.tv_sec;
                       ^
net/core/sock.c:3011:4: error: expected ')' before 'return'
    return -EFAULT;
    ^~~~~~
net/core/sock.c:3013:2: error: expected expression before '}' token
  }
  ^

Fixes: c7cbdbf29f ("net: rework SIOCGSTAMP ioctl handling")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Rothwell 2019-04-23 17:25:24 +10:00 committed by David S. Miller
parent 0fa4122b2d
commit c98f4822ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/sock.c
View File

@ -3004,10 +3004,10 @@ int sock_gettstamp(struct socket *sock, void __user *userstamp,
/* beware of padding in sparc64 timeval */
if (timeval && !in_compat_syscall()) {
struct __kernel_old_timeval __user tv = {
.tv_sec = ts.tv_sec;
.tv_usec = ts.tv_nsec;
.tv_sec = ts.tv_sec,
.tv_usec = ts.tv_nsec,
};
if (copy_to_user(userstamp, &tv, sizeof(tv))
if (copy_to_user(userstamp, &tv, sizeof(tv)))
return -EFAULT;
return 0;
}