Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] hrtimers: remove nsec_t typedef

Browse source 
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: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roman Zippel 2006-03-26 01:38:11 -08:00 committed by Linus Torvalds
parent 272705c597
commit df869b630d
3 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/linux/time.h
View file

@ -73,12 +73,6 @@ extern void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec);
#define timespec_valid(ts) \ #define timespec_valid(ts) \
(((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC)) (((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 xtime;
extern struct timespec wall_to_monotonic; extern struct timespec wall_to_monotonic;
extern seqlock_t xtime_lock; 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 * Returns the scalar nanosecond representation of the timespec
* parameter. * 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 * Returns the scalar nanosecond representation of the timeval
* parameter. * 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; 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. * 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 * 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. * 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__ */ #endif /* __KERNEL__ */

4
kernel/hrtimer.c
View file

@ -266,7 +266,7 @@ ktime_t ktime_add_ns(const ktime_t kt, u64 nsec)
/* /*
* Divide a ktime value by a nanosecond value * 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; u64 dclc, inc, dns;
int sft = 0; int sft = 0;
@ -322,7 +322,7 @@ hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
interval.tv64 = timer->base->resolution.tv64; interval.tv64 = timer->base->resolution.tv64;
if (unlikely(delta.tv64 >= interval.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); orun = ktime_divns(delta, incr);
timer->expires = ktime_add_ns(timer->expires, incr * orun); timer->expires = ktime_add_ns(timer->expires, incr * orun);

4
kernel/time.c
View file

@ -610,7 +610,7 @@ void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec)
* *
* Returns the timespec representation of the nsec parameter. * 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; struct timespec ts;
@ -630,7 +630,7 @@ struct timespec ns_to_timespec(const nsec_t nsec)
* *
* Returns the timeval representation of the nsec parameter. * 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 timespec ts = ns_to_timespec(nsec);
struct timeval tv; struct timeval tv;