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

Commit 8383c423 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

ntp: remove current_tick_length() 



current_tick_length used to do a little more, but now it just returns
tick_length, which we can also access directly at the few places, where it's
needed.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7fc5c784

include/linux/timex.h

+2 −2
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ static inline int ntp_synced(void) 
#endif

#define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)



/* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */

extern u64 current_tick_length(void);

/* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */

extern u64 tick_length;



extern void second_overflow(void);

extern void update_ntp_one_tick(void);

kernel/time/ntp.c

+2 −14
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
 */

unsigned long tick_usec = TICK_USEC; 		/* USER_HZ period (usec) */

unsigned long tick_nsec;			/* ACTHZ period (nsec) */

static u64 tick_length, tick_length_base;

u64 tick_length;

static u64 tick_length_base;



#define MAX_TICKADJ		500		/* microsecs */

#define MAX_TICKADJ_SCALED	(((u64)(MAX_TICKADJ * NSEC_PER_USEC) << \
@@ -203,19 +204,6 @@ void second_overflow(void) 
	}

}



/*

 * 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 shifted by the

 * specified number of bits to the right of the binary point.

 * This function has no side-effects.

 */

u64 current_tick_length(void)

{

	return tick_length;

}



#ifdef CONFIG_GENERIC_CMOS_UPDATE



/* Disable the cmos update - used by virtualization and embedded */

kernel/time/timekeeping.c

+2 −3
Original line number Diff line number Diff line
@@ -380,8 +380,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval, 
	 * Now calculate the error in (1 << look_ahead) ticks, but first

	 * remove the single look ahead already included in the error.

	 */

	tick_error = current_tick_length() >>

		(NTP_SCALE_SHIFT - clock->shift + 1);

	tick_error = tick_length >> (NTP_SCALE_SHIFT - clock->shift + 1);

	tick_error -= clock->xtime_interval >> 1;

	error = ((error - tick_error) >> look_ahead) + tick_error;
@@ -473,7 +472,7 @@ void update_wall_time(void) 
		}



		/* accumulate error between NTP and clock interval */

		clock->error += current_tick_length();

		clock->error += tick_length;

		clock->error -= clock->xtime_interval << (NTP_SCALE_SHIFT - clock->shift);

	}