diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-19 01:49:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 10:04:52 -0700 |
| commit | 71120f183bff04ba4f7ba3cc554202061912d548 (patch) | |
| tree | 3b8281d6d3c6034aab4c3fa1c15dfd95faf2c17f /kernel | |
| parent | 10146801e8b960d7473e350b60458d9d5a2be1cf (diff) | |
| download | kernel-crypto-71120f183bff04ba4f7ba3cc554202061912d548.tar.gz kernel-crypto-71120f183bff04ba4f7ba3cc554202061912d548.tar.xz kernel-crypto-71120f183bff04ba4f7ba3cc554202061912d548.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/timekeeping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 728cedfd3cb..89698776613 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, * 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; |