Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e4f70e2 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Linus Torvalds
Browse files

time: remove timespec_add_safe() 

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.

Link: http://lkml.kernel.org/r/1461947989-21926-4-git-send-email-deepa.kernel@gmail.com


Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 766b9f92

include/linux/time64.h

+7 −8
Original line number Diff line number Diff line
@@ -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 */

kernel/time/time.c

+0 −4
Original line number Diff line number Diff line
@@ -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