Hi all,
After merging the net-next tree, today's linux-next build (sparc64
defconfig) failed like this:
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
}
^
Caused by commit
c7cbdbf29f48 ("net: rework SIOCGSTAMP ioctl handling")
I have applied the followinf patch for today:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 23 Apr 2019 17:12:19 +1000
Subject: [PATCH] net: fix sparc64 compilation of sock_gettstamp
Fixes: c7cbdbf29f48 ("net: rework SIOCGSTAMP ioctl handling")
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
net/core/sock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index 443b98d05f1e..925b84a872dd 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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;
}
--
2.20.1
--
Cheers,
Stephen Rothwell
Attachment:
pgp524amaKQ3l.pgp
Description: OpenPGP digital signature
