[PATCH 2/5] increase current_tick_length() resolution

[Roman Zippel <zippel@linux-m68k.org>]

Increase the scale for current_tick_length() to 32bit, which gives NTP
more room for improvement and makes it simpler to extract the full nsec
part.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>

---

 arch/powerpc/kernel/time.c |    2 +-
 kernel/timer.c             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-mm/arch/powerpc/kernel/time.c
===================================================================
--- linux-2.6-mm.orig/arch/powerpc/kernel/time.c	2006-04-02 17:23:17.000000000 +0200
+++ linux-2.6-mm/arch/powerpc/kernel/time.c	2006-04-02 17:23:23.000000000 +0200
@@ -103,7 +103,7 @@ EXPORT_SYMBOL(tb_ticks_per_sec);	/* for 
 u64 tb_to_xs;
 unsigned tb_to_us;
 
-#define TICKLEN_SCALE	(SHIFT_SCALE - 10)
+#define TICKLEN_SCALE	32
 u64 last_tick_len;	/* units are ns / 2^TICKLEN_SCALE */
 u64 ticklen_to_xs;	/* 0.64 fraction */
 
Index: linux-2.6-mm/kernel/timer.c
===================================================================
--- linux-2.6-mm.orig/kernel/timer.c	2006-04-02 17:23:17.000000000 +0200
+++ linux-2.6-mm/kernel/timer.c	2006-04-02 17:23:23.000000000 +0200
@@ -767,7 +767,7 @@ static void update_wall_time_one_tick(vo
  * Return how long ticks are at the moment, that is, how much time
  * update_wall_time_one_tick will add to xtime next time we call it
  * (assuming no calls to do_adjtimex in the meantime).
- * The return value is in fixed-point nanoseconds with SHIFT_SCALE-10
+ * The return value is in fixed-point nanoseconds with 32
  * bits to the right of the binary point.
  * This function has no side-effects.
  */
@@ -776,7 +776,7 @@ u64 current_tick_length(void)
 	long delta_nsec;
 
 	delta_nsec = tick_nsec + adjtime_adjustment() * 1000;
-	return ((u64) delta_nsec << (SHIFT_SCALE - 10)) + time_adj;
+	return ((u64)delta_nsec << 32) + ((s64)time_adj << (32 - (SHIFT_SCALE - 10)));
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/