Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1391293

[PATCH 3/3] time: Remove timespec_add_safe()

Show all headers | View raw

All references to timespec_add_safe() now use
timespec64_add_safe().

The plan is to replace struct timespec references
with struct timespec64 throughout the kernel as
timespec is not y2038 safe.

Drop timespec_add_safe() and use timespec64_add_safe()
for all architectures.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/time64.h | 15 +++++++--------
 kernel/time/time.c     |  4 ----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/include/linux/time64.h b/include/linux/time64.h
index 1778937..7e5d2fa 100644
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
@@ -65,7 +65,6 @@ static inline struct itimerspec64 itimerspec_to_itimerspec64(struct itimerspec *
 # define timespec64_equal		timespec_equal
 # define timespec64_compare		timespec_compare
 # define set_normalized_timespec64	set_normalized_timespec
-# define timespec64_add_safe		timespec_add_safe
 # define timespec64_add			timespec_add
 # define timespec64_sub			timespec_sub
 # define timespec64_valid		timespec_valid
@@ -134,13 +133,6 @@ static inline int timespec64_compare(const struct timespec64 *lhs, const struct
 
 extern void set_normalized_timespec64(struct timespec64 *ts, time64_t sec, s64 nsec);
 
-/*
- * timespec64_add_safe assumes both values are positive and checks for
- * overflow. It will return TIME64_MAX in case of overflow.
- */
-extern struct timespec64 timespec64_add_safe(const struct timespec64 lhs,
-					 const struct timespec64 rhs);
-
 static inline struct timespec64 timespec64_add(struct timespec64 lhs,
 						struct timespec64 rhs)
 {
@@ -222,4 +214,11 @@ static __always_inline void timespec64_add_ns(struct timespec64 *a, u64 ns)
 
 #endif
 
+/*
+ * timespec64_add_safe assumes both values are positive and checks for
+ * overflow. It will return TIME64_MAX in case of overflow.
+ */
+extern struct timespec64 timespec64_add_safe(const struct timespec64 lhs,
+					 const struct timespec64 rhs);
+
 #endif /* _LINUX_TIME64_H */
diff --git a/kernel/time/time.c b/kernel/time/time.c
index 558f5fe..703306a 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -770,8 +770,6 @@ struct timespec timespec_add_safe(const struct timespec lhs,
 	return res;
 }
 
-#if __BITS_PER_LONG != 64
-
 /*
  * Add two timespec64 values and do a safety check for overflow.
  * It's assumed that both values are valid (>= 0).
@@ -792,5 +790,3 @@ struct timespec64 timespec64_add_safe(const struct timespec64 lhs,
 
 	return res;
 }
-
-#endif
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] Use timespec64 for select like timeouts Deepa Dinamani <deepa.kernel@gmail.com> - 2016-04-29 18:50 +0200
  [PATCH 3/3] time: Remove timespec_add_safe() Deepa Dinamani <deepa.kernel@gmail.com> - 2016-04-29 18:50 +0200
  [PATCH 2/3] fs: poll/select/recvmmsg: use timespec64 for timeout events Deepa Dinamani <deepa.kernel@gmail.com> - 2016-04-29 18:50 +0200
    [RESEND PATCH 2/3] fs: poll/select/recvmmsg: use timespec64 for timeout events Deepa Dinamani <deepa.kernel@gmail.com> - 2016-05-04 21:30 +0200
      Re: [RESEND PATCH 2/3] fs: poll/select/recvmmsg: use timespec64 for  timeout events John Stultz <john.stultz@linaro.org> - 2016-05-04 22:10 +0200
        Re: [Y2038] [RESEND PATCH 2/3] fs: poll/select/recvmmsg: use timespec64 for timeout events Arnd Bergmann <arnd@arndb.de> - 2016-05-05 01:30 +0200
          Re: [Y2038] [RESEND PATCH 2/3] fs: poll/select/recvmmsg: use  timespec64 for timeout events Andrew Morton <akpm@linux-foundation.org> - 2016-05-05 02:00 +0200
            Re: [Y2038] [RESEND PATCH 2/3] fs: poll/select/recvmmsg: use  timespec64 for timeout events John Stultz <john.stultz@linaro.org> - 2016-05-05 02:10 +0200
              Re: [Y2038] [RESEND PATCH 2/3] fs: poll/select/recvmmsg: use  timespec64 for timeout events David Miller <davem@davemloft.net> - 2016-05-06 21:50 +0200

csiph-web