From 416e848a51252a17fdaf7500be55fa95c3408274 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 19 Jul 2007 01:49:16 -0700
Subject: [PATCH] --- yaml --- r: 61655 b: refs/heads/master c:
 71120f183bff04ba4f7ba3cc554202061912d548 h: refs/heads/master i:   61653:
 1026818c34a1a7d9fe6a6a4651ac9e09583042a5   61651:
 beda94586d86f306394db50008f3fefa21e35450   61647:
 bf864379817f1be85ea4700b346b3b50103ea426 v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/time/timekeeping.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 632b17099c2c..d0d90b566636 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10146801e8b960d7473e350b60458d9d5a2be1cf
+refs/heads/master: 71120f183bff04ba4f7ba3cc554202061912d548
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index 728cedfd3cbd..89698776613e 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/kernel/time/timekeeping.c
@@ -401,7 +401,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
  * this is optimized for the most common adjustments of -1,0,1,
  * for other values we can do a bit more work.
  */
-static void clocksource_adjust(struct clocksource *clock, s64 offset)
+static void clocksource_adjust(s64 offset)
 {
 	s64 error, interval = clock->cycle_interval;
 	int adj;
@@ -476,7 +476,7 @@ void update_wall_time(void)
 	}
 
 	/* correct the clock when NTP error is too big */
-	clocksource_adjust(clock, offset);
+	clocksource_adjust(offset);
 
 	/* store full nanoseconds into xtime */
 	xtime.tv_nsec = (s64)clock->xtime_nsec >> clock->shift;