Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71120f18 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

timekeeping: fixup shadow variable argument 



clocksource_adjust() has a clock argument, which shadows the file global clock
variable.  Fix this up.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 10146801

kernel/time/timekeeping.c

+2 −2
Original line number Diff line number Diff line
@@ -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;