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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
timex.h
diff --git
a/include/linux/timex.h
b/include/linux/timex.h
index
03914b7
..
d543d38
100644
(file)
--- a/
include/linux/timex.h
+++ b/
include/linux/timex.h
@@
-53,12
+53,10
@@
#ifndef _LINUX_TIMEX_H
#define _LINUX_TIMEX_H
#ifndef _LINUX_TIMEX_H
#define _LINUX_TIMEX_H
-#include <linux/config.h>
#include <linux/compiler.h>
#include <linux/time.h>
#include <asm/param.h>
#include <linux/compiler.h>
#include <linux/time.h>
#include <asm/param.h>
-#include <asm/timex.h>
/*
* SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
/*
* SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
@@
-192,6
+190,8
@@
struct timex {
#define TIME_BAD TIME_ERROR /* bw compat */
#ifdef __KERNEL__
#define TIME_BAD TIME_ERROR /* bw compat */
#ifdef __KERNEL__
+#include <asm/timex.h>
+
/*
* kernel variables
* Note: maximum error = NTP synch distance = dispersion + delay / 2;
/*
* kernel variables
* Note: maximum error = NTP synch distance = dispersion + delay / 2;
@@
-304,6
+304,8
@@
time_interpolator_reset(void)
#endif /* !CONFIG_TIME_INTERPOLATION */
#endif /* !CONFIG_TIME_INTERPOLATION */
+#define TICK_LENGTH_SHIFT 32
+
/* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */
extern u64 current_tick_length(void);
/* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */
extern u64 current_tick_length(void);