The patch titled
ntp: add time_adj to tick length
has been removed from the -mm tree. Its filename is
ntp-add-time_adj-to-tick-length.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ntp: add time_adj to tick length
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
This makes time_adj local to second_overflow() and integrates it into the tick
length instead of adding it everytime.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/time/ntp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN kernel/time/ntp.c~ntp-add-time_adj-to-tick-length kernel/time/ntp.c
--- a/kernel/time/ntp.c~ntp-add-time_adj-to-tick-length
+++ a/kernel/time/ntp.c
@@ -39,7 +39,6 @@ long time_maxerror = NTP_PHASE_LIMIT; /*
long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */
long time_freq = (((NSEC_PER_SEC + HZ/2) % HZ - HZ/2) << SHIFT_USEC) / NSEC_PER_USEC;
/* frequency offset (scaled ppm)*/
-static long time_adj; /* tick adjust (scaled 1 / HZ) */
long time_reftime; /* time at last adjustment (s) */
long time_adjust;
long time_next_adjust;
@@ -84,7 +83,7 @@ void ntp_update_frequency(void)
*/
void second_overflow(void)
{
- long ltemp;
+ long ltemp, time_adj;
/* Bump the maxerror field */
time_maxerror += time_tolerance >> SHIFT_USEC;
@@ -189,6 +188,7 @@ void second_overflow(void)
time_adj += shift_right(time_adj, 6) + shift_right(time_adj, 7);
#endif
tick_length = tick_length_base;
+ tick_length += (s64)time_adj << (TICK_LENGTH_SHIFT - (SHIFT_SCALE - 10));
}
/*
@@ -245,11 +245,9 @@ u64 current_tick_length(void)
u64 ret;
/* calculate the finest interval NTP will allow.
- * ie: nanosecond value shifted by (SHIFT_SCALE - 10)
*/
ret = tick_length;
ret += (u64)(adjtime_adjustment() * 1000) << TICK_LENGTH_SHIFT;
- ret += (s64)time_adj << (TICK_LENGTH_SHIFT - (SHIFT_SCALE - 10));
return ret;
}
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
origin.patch
git-lxdialog.patch
introduce-kernel_execve.patch
rename-the-provided-execve-functions-to-kernel_execve.patch
provide-kernel_execve-on-all-architectures.patch
provide-kernel_execve-on-all-architectures-fix.patch
remove-the-use-of-_syscallx-macros-in-uml.patch
sh64-remove-the-use-of-kernel-syscalls.patch
remove-remaining-errno-and-__kernel_syscalls__-references.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
