From: Deepa Dinamani <deepa.kernel@gmail.com>
To: davem@davemloft.net, linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, viro@zeniv.linux.org.uk, arnd@arndb.de,
y2038@lists.linaro.org, sparclinux@vger.kernel.org
Subject: [PATCH 4/8] arch: sparc: Override struct __kernel_old_timeval
Date: Fri, 23 Nov 2018 18:20:31 -0800 [thread overview]
Message-ID: <20181124022035.17519-5-deepa.kernel@gmail.com> (raw)
In-Reply-To: <20181124022035.17519-1-deepa.kernel@gmail.com>
struct __kernel_old_timeval is supposed to have the same
layout as struct timeval. But, it was inadvarently missed
that __kernel_suseconds has a different definition for
sparc64.
Provide an asm-specific override that fixes it.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: sparclinux@vger.kernel.org
---
arch/sparc/include/uapi/asm/posix_types.h | 10 ++++++++++
include/uapi/linux/time.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/arch/sparc/include/uapi/asm/posix_types.h b/arch/sparc/include/uapi/asm/posix_types.h
index fec499d6efb7..f139e0048628 100644
--- a/arch/sparc/include/uapi/asm/posix_types.h
+++ b/arch/sparc/include/uapi/asm/posix_types.h
@@ -19,6 +19,16 @@ typedef unsigned short __kernel_old_gid_t;
typedef int __kernel_suseconds_t;
#define __kernel_suseconds_t __kernel_suseconds_t
+typedef long __kernel_long_t;
+typedef unsigned long __kernel_ulong_t;
+#define __kernel_long_t __kernel_long_t
+
+struct __kernel_old_timeval {
+ __kernel_long_t tv_sec;
+ __kernel_suseconds_t tv_usec;
+};
+#define __kernel_old_timeval __kernel_old_timeval
+
#else
/* sparc 32 bit */
diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h
index 6b56a2208be7..04d5587f30d3 100644
--- a/include/uapi/linux/time.h
+++ b/include/uapi/linux/time.h
@@ -63,10 +63,12 @@ struct __kernel_itimerspec {
* here, this is probably because it is not y2038 safe and needs to
* be changed to use another interface.
*/
+#ifndef __kernel_old_timeval
struct __kernel_old_timeval {
__kernel_long_t tv_sec;
__kernel_long_t tv_usec;
};
+#endif
/*
* The IDs of the various system clocks (for POSIX.1b interval timers):
--
2.17.1
next prev parent reply other threads:[~2018-11-24 2:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-24 2:20 [PATCH 0/8] net: y2038-safe socket timestamps Deepa Dinamani
2018-11-24 2:20 ` [PATCH 1/8] arch: Use asm-generic/socket.h when possible Deepa Dinamani
2018-11-24 2:20 ` [PATCH 2/8] sockopt: Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD Deepa Dinamani
2018-11-25 3:58 ` Willem de Bruijn
2018-11-30 22:38 ` Deepa Dinamani
2018-11-30 23:33 ` Willem de Bruijn
2018-11-24 2:20 ` [PATCH 3/8] socket: Disentangle SOCK_RCVTSTAMPNS from SOCK_RCVTSTAMP Deepa Dinamani
2018-11-25 3:59 ` Willem de Bruijn
2018-11-25 5:06 ` Deepa Dinamani
2018-11-25 14:18 ` Willem de Bruijn
2018-11-25 18:19 ` David Miller
2018-11-30 22:16 ` Deepa Dinamani
2018-11-30 23:31 ` Willem de Bruijn
2018-11-24 2:20 ` Deepa Dinamani [this message]
2018-11-24 2:20 ` [PATCH 5/8] socket: Use old_timeval types for socket timestamps Deepa Dinamani
2018-11-24 2:20 ` [PATCH 6/8] socket: Add struct sock_timeval Deepa Dinamani
2018-11-24 19:37 ` Willem de Bruijn
2018-11-25 2:09 ` David Miller
2018-11-25 4:52 ` Deepa Dinamani
2018-11-25 20:50 ` Arnd Bergmann
2018-11-26 16:33 ` Deepa Dinamani
2018-11-24 2:20 ` [PATCH 7/8] socket: Add SO_TIMESTAMP[NS]_NEW Deepa Dinamani
2018-11-25 3:59 ` Willem de Bruijn
2018-11-25 4:17 ` Willem de Bruijn
2018-11-25 5:28 ` Deepa Dinamani
2018-11-25 5:55 ` Deepa Dinamani
2018-11-25 14:38 ` Willem de Bruijn
2018-11-25 14:33 ` Willem de Bruijn
2018-11-25 22:35 ` Arnd Bergmann
2018-11-26 0:25 ` Willem de Bruijn
2018-11-30 22:43 ` Deepa Dinamani
2018-11-30 23:37 ` Willem de Bruijn
2018-11-24 2:20 ` [PATCH 8/8] socket: Add SO_TIMESTAMPING_NEW Deepa Dinamani
2018-11-25 4:00 ` Willem de Bruijn
2018-11-25 5:07 ` Deepa Dinamani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181124022035.17519-5-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).