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

Commit f2a5a085 authored by John Stultz's avatar John Stultz Committed by Thomas Gleixner
Browse files

time: Move arch_gettimeoffset() usage into timekeeping_get_ns() 



Since we call arch_gettimeoffset() in all the accessor
functions, move arch_gettimeoffset() calls into
timekeeping_get_ns() and timekeeping_get_ns_raw() to simplify
the code.

This also makes the code easier to maintain as we don't have to
worry about forgetting the arch_gettimeoffset() as has happened
in the past.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Link: http://lkml.kernel.org/r/1342156917-25092-7-git-send-email-john.stultz@linaro.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1f4f9487

kernel/time/timekeeping.c

+10 −19
Original line number Diff line number Diff line
@@ -191,13 +191,17 @@ static inline s64 timekeeping_get_ns(void) 
	cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;



	nsec = cycle_delta * timekeeper.mult + timekeeper.xtime_nsec;

	return nsec >> timekeeper.shift;

	nsec >>= timekeeper.shift;



	/* If arch requires, add in gettimeoffset() */

	return nsec + arch_gettimeoffset();

}



static inline s64 timekeeping_get_ns_raw(void)

{

	cycle_t cycle_now, cycle_delta;

	struct clocksource *clock;

	s64 nsec;



	/* read clocksource: */

	clock = timekeeper.clock;
@@ -206,8 +210,11 @@ static inline s64 timekeeping_get_ns_raw(void) 
	/* calculate the delta since the last update_wall_time: */

	cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;



	/* return delta convert to nanoseconds. */

	return clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);

	/* convert delta to nanoseconds. */

	nsec = clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);



	/* If arch requires, add in gettimeoffset() */

	return nsec + arch_gettimeoffset();

}



static void update_rt_offset(void)
@@ -282,9 +289,6 @@ void getnstimeofday(struct timespec *ts) 
		ts->tv_sec = timekeeper.xtime_sec;

		ts->tv_nsec = timekeeping_get_ns();



		/* If arch requires, add in gettimeoffset() */

		nsecs += arch_gettimeoffset();



	} while (read_seqretry(&timekeeper.lock, seq));



	timespec_add_ns(ts, nsecs);
@@ -304,8 +308,6 @@ ktime_t ktime_get(void) 
				timekeeper.wall_to_monotonic.tv_sec;

		nsecs = timekeeping_get_ns() +

				timekeeper.wall_to_monotonic.tv_nsec;

		/* If arch requires, add in gettimeoffset() */

		nsecs += arch_gettimeoffset();



	} while (read_seqretry(&timekeeper.lock, seq));

	/*
@@ -336,8 +338,6 @@ void ktime_get_ts(struct timespec *ts) 
		ts->tv_sec = timekeeper.xtime_sec;

		ts->tv_nsec = timekeeping_get_ns();

		tomono = timekeeper.wall_to_monotonic;

		/* If arch requires, add in gettimeoffset() */

		ts->tv_nsec += arch_gettimeoffset();



	} while (read_seqretry(&timekeeper.lock, seq));
@@ -365,8 +365,6 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) 
	WARN_ON_ONCE(timekeeping_suspended);



	do {

		u32 arch_offset;



		seq = read_seqbegin(&timekeeper.lock);



		*ts_raw = timekeeper.raw_time;
@@ -376,11 +374,6 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) 
		nsecs_raw = timekeeping_get_ns_raw();

		nsecs_real = timekeeping_get_ns();



		/* If arch requires, add in gettimeoffset() */

		arch_offset = arch_gettimeoffset();

		nsecs_raw += arch_offset;

		nsecs_real += arch_offset;



	} while (read_seqretry(&timekeeper.lock, seq));



	timespec_add_ns(ts_raw, nsecs_raw);
@@ -1338,8 +1331,6 @@ ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot) 


		secs = timekeeper.xtime_sec;

		nsecs = timekeeping_get_ns();

		/* If arch requires, add in gettimeoffset() */

		nsecs += arch_gettimeoffset();



		*offs_real = timekeeper.offs_real;

		*offs_boot = timekeeper.offs_boot;