diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 21:02:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 21:02:45 +0100 |
| commit | 58a14ee9c49aa2b9742c56a0477666335368e05e (patch) | |
| tree | 01dae0e9458eea6289f78bd21cea056798e5c75e /kernel/time/ntp.c | |
| parent | splice: fix user pointer access in get_iovec_page_array() (diff) | |
| parent | hrtimer: don't modify restart_block->fn in restart functions (diff) | |
| download | linux-58a14ee9c49aa2b9742c56a0477666335368e05e.tar.xz linux-58a14ee9c49aa2b9742c56a0477666335368e05e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
hrtimer: don't modify restart_block->fn in restart functions
hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
hrtimer: fix *rmtp handling in hrtimer_nanosleep()
ntp: correct inconsistent interval/tick_length usage
Diffstat (limited to 'kernel/time/ntp.c')
| -rw-r--r-- | kernel/time/ntp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index e64efaf957e8..c88b5910e7ab 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -43,10 +43,6 @@ long time_freq; /* frequency offset (scaled ppm)*/ static long time_reftime; /* time at last adjustment (s) */ long time_adjust; -#define CLOCK_TICK_OVERFLOW (LATCH * HZ - CLOCK_TICK_RATE) -#define CLOCK_TICK_ADJUST (((s64)CLOCK_TICK_OVERFLOW * NSEC_PER_SEC) / \ - (s64)CLOCK_TICK_RATE) - static void ntp_update_frequency(void) { u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) |