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

Commit 4498e746 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

time: Parametrize all tk_fast_mono users 



In preparation for more tk_fast instances, remove all hard-coded
tk_fast_mono references.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150319093400.484279927@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 4a4ad80d

kernel/time/timekeeping.c

+15 −10
Original line number Diff line number Diff line
@@ -364,18 +364,18 @@ static inline s64 timekeeping_get_ns(struct tk_read_base *tkr) 
 * slightly wrong timestamp (a few nanoseconds). See

 * @ktime_get_mono_fast_ns.

 */

static void update_fast_timekeeper(struct tk_read_base *tkr)

static void update_fast_timekeeper(struct tk_read_base *tkr, struct tk_fast *tkf)

{

	struct tk_read_base *base = tk_fast_mono.base;

	struct tk_read_base *base = tkf->base;



	/* Force readers off to base[1] */

	raw_write_seqcount_latch(&tk_fast_mono.seq);

	raw_write_seqcount_latch(&tkf->seq);



	/* Update base[0] */

	memcpy(base, tkr, sizeof(*base));



	/* Force readers back to base[0] */

	raw_write_seqcount_latch(&tk_fast_mono.seq);

	raw_write_seqcount_latch(&tkf->seq);



	/* Update base[1] */

	memcpy(base + 1, base, sizeof(*base));
@@ -413,20 +413,25 @@ static void update_fast_timekeeper(struct tk_read_base *tkr) 
 * of the following timestamps. Callers need to be aware of that and

 * deal with it.

 */

u64 notrace ktime_get_mono_fast_ns(void)

static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf)

{

	struct tk_read_base *tkr;

	unsigned int seq;

	u64 now;



	do {

		seq = raw_read_seqcount(&tk_fast_mono.seq);

		tkr = tk_fast_mono.base + (seq & 0x01);

		seq = raw_read_seqcount(&tkf->seq);

		tkr = tkf->base + (seq & 0x01);

		now = ktime_to_ns(tkr->base) + timekeeping_get_ns(tkr);

	} while (read_seqcount_retry(&tkf->seq, seq));



	} while (read_seqcount_retry(&tk_fast_mono.seq, seq));

	return now;

}



u64 ktime_get_mono_fast_ns(void)

{

	return __ktime_get_fast_ns(&tk_fast_mono);

}

EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);



/* Suspend-time cycles value for halted fast timekeeper. */
@@ -455,7 +460,7 @@ static void halt_fast_timekeeper(struct timekeeper *tk) 
	memcpy(&tkr_dummy, tkr, sizeof(tkr_dummy));

	cycles_at_suspend = tkr->read(tkr->clock);

	tkr_dummy.read = dummy_clock_read;

	update_fast_timekeeper(&tkr_dummy);

	update_fast_timekeeper(&tkr_dummy, &tk_fast_mono);

}



#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
@@ -586,7 +591,7 @@ static void timekeeping_update(struct timekeeper *tk, unsigned int action) 
		memcpy(&shadow_timekeeper, &tk_core.timekeeper,

		       sizeof(tk_core.timekeeper));



	update_fast_timekeeper(&tk->tkr_mono);

	update_fast_timekeeper(&tk->tkr_mono, &tk_fast_mono);

}



/**