aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-07-19 04:49:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:52 -0400
commit71120f183bff04ba4f7ba3cc554202061912d548 (patch)
tree3b8281d6d3c6034aab4c3fa1c15dfd95faf2c17f
parent10146801e8b960d7473e350b60458d9d5a2be1cf (diff)
timekeeping: fixup shadow variable argument
clocksource_adjust() has a clock argument, which shadows the file global clock variable. Fix this up. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: john stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/time/timekeeping.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 728cedfd3cbd..89698776613e 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -401,7 +401,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
401 * this is optimized for the most common adjustments of -1,0,1, 401 * this is optimized for the most common adjustments of -1,0,1,
402 * for other values we can do a bit more work. 402 * for other values we can do a bit more work.
403 */ 403 */
404static void clocksource_adjust(struct clocksource *clock, s64 offset) 404static void clocksource_adjust(s64 offset)
405{ 405{
406 s64 error, interval = clock->cycle_interval; 406 s64 error, interval = clock->cycle_interval;
407 int adj; 407 int adj;
@@ -476,7 +476,7 @@ void update_wall_time(void)
476 } 476 }
477 477
478 /* correct the clock when NTP error is too big */ 478 /* correct the clock when NTP error is too big */
479 clocksource_adjust(clock, offset); 479 clocksource_adjust(offset);
480 480
481 /* store full nanoseconds into xtime */ 481 /* store full nanoseconds into xtime */
482 xtime.tv_nsec = (s64)clock->xtime_nsec >> clock->shift; 482 xtime.tv_nsec = (s64)clock->xtime_nsec >> clock->shift;