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

Commit df869b63 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] hrtimers: remove nsec_t typedef 



nsec_t predates ktime_t and has mostly been superseded by it.  In the few
places that are left it's better to make it explicit that we're dealing with
64 bit values here.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 272705c5

include/linux/time.h

+6 −12
Original line number Diff line number Diff line
@@ -73,12 +73,6 @@ extern void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec); 
#define timespec_valid(ts) \

	(((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC))



/*

 * 64-bit nanosec type. Large enough to span 292+ years in nanosecond

 * resolution. Ought to be enough for a while.

 */

typedef s64 nsec_t;



extern struct timespec xtime;

extern struct timespec wall_to_monotonic;

extern seqlock_t xtime_lock;
@@ -114,9 +108,9 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran); 
 * Returns the scalar nanosecond representation of the timespec

 * parameter.

 */

static inline nsec_t timespec_to_ns(const struct timespec *ts)

static inline s64 timespec_to_ns(const struct timespec *ts)

{

	return ((nsec_t) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;

	return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;

}



/**
@@ -126,9 +120,9 @@ static inline nsec_t timespec_to_ns(const struct timespec *ts) 
 * Returns the scalar nanosecond representation of the timeval

 * parameter.

 */

static inline nsec_t timeval_to_ns(const struct timeval *tv)

static inline s64 timeval_to_ns(const struct timeval *tv)

{

	return ((nsec_t) tv->tv_sec * NSEC_PER_SEC) +

	return ((s64) tv->tv_sec * NSEC_PER_SEC) +

		tv->tv_usec * NSEC_PER_USEC;

}
@@ -138,7 +132,7 @@ static inline nsec_t timeval_to_ns(const struct timeval *tv) 
 *

 * Returns the timespec representation of the nsec parameter.

 */

extern struct timespec ns_to_timespec(const nsec_t nsec);

extern struct timespec ns_to_timespec(const s64 nsec);



/**

 * ns_to_timeval - Convert nanoseconds to timeval
@@ -146,7 +140,7 @@ extern struct timespec ns_to_timespec(const nsec_t nsec); 
 *

 * Returns the timeval representation of the nsec parameter.

 */

extern struct timeval ns_to_timeval(const nsec_t nsec);

extern struct timeval ns_to_timeval(const s64 nsec);



#endif /* __KERNEL__ */

kernel/hrtimer.c

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ ktime_t ktime_add_ns(const ktime_t kt, u64 nsec) 
/*

 * Divide a ktime value by a nanosecond value

 */

static unsigned long ktime_divns(const ktime_t kt, nsec_t div)

static unsigned long ktime_divns(const ktime_t kt, s64 div)

{

	u64 dclc, inc, dns;

	int sft = 0;
@@ -322,7 +322,7 @@ hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) 
		interval.tv64 = timer->base->resolution.tv64;



	if (unlikely(delta.tv64 >= interval.tv64)) {

		nsec_t incr = ktime_to_ns(interval);

		s64 incr = ktime_to_ns(interval);



		orun = ktime_divns(delta, incr);

		timer->expires = ktime_add_ns(timer->expires, incr * orun);

kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec) 
 *

 * Returns the timespec representation of the nsec parameter.

 */

struct timespec ns_to_timespec(const nsec_t nsec)

struct timespec ns_to_timespec(const s64 nsec)

{

	struct timespec ts;
@@ -630,7 +630,7 @@ struct timespec ns_to_timespec(const nsec_t nsec) 
 *

 * Returns the timeval representation of the nsec parameter.

 */

struct timeval ns_to_timeval(const nsec_t nsec)

struct timeval ns_to_timeval(const s64 nsec)

{

	struct timespec ts = ns_to_timespec(nsec);

	struct timeval tv;