git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
linux
/
times.h
diff --git
a/include/linux/times.h
b/include/linux/times.h
index
a682537
..
ff00f33
100644
(file)
--- a/
include/linux/times.h
+++ b/
include/linux/times.h
@@
-2,15
+2,21
@@
#define _LINUX_TIMES_H
#ifdef __KERNEL__
#define _LINUX_TIMES_H
#ifdef __KERNEL__
+#include <linux/timex.h>
#include <asm/div64.h>
#include <asm/types.h>
#include <asm/param.h>
#include <asm/div64.h>
#include <asm/types.h>
#include <asm/param.h>
-#if (HZ % USER_HZ)==0
-# define jiffies_to_clock_t(x) ((x) / (HZ / USER_HZ))
+static inline clock_t jiffies_to_clock_t(long x)
+{
+#if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
+ return x / (HZ / USER_HZ);
#else
#else
-# define jiffies_to_clock_t(x) ((clock_t) jiffies_64_to_clock_t((u64) x))
+ u64 tmp = (u64)x * TICK_NSEC;
+ do_div(tmp, (NSEC_PER_SEC / USER_HZ));
+ return (long)tmp;
#endif
#endif
+}
static inline unsigned long clock_t_to_jiffies(unsigned long x)
{
static inline unsigned long clock_t_to_jiffies(unsigned long x)
{
@@
-34,7
+40,7
@@
static inline unsigned long clock_t_to_jiffies(unsigned long x)
static inline u64 jiffies_64_to_clock_t(u64 x)
{
static inline u64 jiffies_64_to_clock_t(u64 x)
{
-#if (
HZ % USER_HZ)==
0
+#if (
TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) ==
0
do_div(x, HZ / USER_HZ);
#else
/*
do_div(x, HZ / USER_HZ);
#else
/*
@@
-42,8
+48,8
@@
static inline u64 jiffies_64_to_clock_t(u64 x)
* but even this doesn't overflow in hundreds of years
* in 64 bits, so..
*/
* but even this doesn't overflow in hundreds of years
* in 64 bits, so..
*/
- x *=
USER_HZ
;
- do_div(x,
HZ
);
+ x *=
TICK_NSEC
;
+ do_div(x,
(NSEC_PER_SEC / USER_HZ)
);
#endif
return x;
}
#endif
return x;
}