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

Commit 876e7881 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

time: Rename timekeeper::tkr to timekeeper::tkr_mono 



In preparation of adding another tkr field, rename this one to
tkr_mono. Also rename tk_read_base::base_mono to tk_read_base::base,
since the structure is not specific to CLOCK_MONOTONIC and the mono
name got added to the tk_read_base instance.

Lots of trivial churn.

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.344679419@infradead.org


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

arch/arm64/kernel/vdso.c

+5 −5
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, 
void update_vsyscall(struct timekeeper *tk)

{

	struct timespec xtime_coarse;

	u32 use_syscall = strcmp(tk->tkr.clock->name, "arch_sys_counter");

	u32 use_syscall = strcmp(tk->tkr_mono.clock->name, "arch_sys_counter");



	++vdso_data->tb_seq_count;

	smp_wmb();
@@ -213,11 +213,11 @@ void update_vsyscall(struct timekeeper *tk) 
	vdso_data->wtm_clock_nsec		= tk->wall_to_monotonic.tv_nsec;



	if (!use_syscall) {

		vdso_data->cs_cycle_last	= tk->tkr.cycle_last;

		vdso_data->cs_cycle_last	= tk->tkr_mono.cycle_last;

		vdso_data->xtime_clock_sec	= tk->xtime_sec;

		vdso_data->xtime_clock_nsec	= tk->tkr.xtime_nsec;

		vdso_data->cs_mult		= tk->tkr.mult;

		vdso_data->cs_shift		= tk->tkr.shift;

		vdso_data->xtime_clock_nsec	= tk->tkr_mono.xtime_nsec;

		vdso_data->cs_mult		= tk->tkr_mono.mult;

		vdso_data->cs_shift		= tk->tkr_mono.shift;

	}



	smp_wmb();

arch/s390/kernel/time.c

+9 −9
Original line number Diff line number Diff line
@@ -215,20 +215,20 @@ void update_vsyscall(struct timekeeper *tk) 
{

	u64 nsecps;



	if (tk->tkr.clock != &clocksource_tod)

	if (tk->tkr_mono.clock != &clocksource_tod)

		return;



	/* Make userspace gettimeofday spin until we're done. */

	++vdso_data->tb_update_count;

	smp_wmb();

	vdso_data->xtime_tod_stamp = tk->tkr.cycle_last;

	vdso_data->xtime_tod_stamp = tk->tkr_mono.cycle_last;

	vdso_data->xtime_clock_sec = tk->xtime_sec;

	vdso_data->xtime_clock_nsec = tk->tkr.xtime_nsec;

	vdso_data->xtime_clock_nsec = tk->tkr_mono.xtime_nsec;

	vdso_data->wtom_clock_sec =

		tk->xtime_sec + tk->wall_to_monotonic.tv_sec;

	vdso_data->wtom_clock_nsec = tk->tkr.xtime_nsec +

		+ ((u64) tk->wall_to_monotonic.tv_nsec << tk->tkr.shift);

	nsecps = (u64) NSEC_PER_SEC << tk->tkr.shift;

	vdso_data->wtom_clock_nsec = tk->tkr_mono.xtime_nsec +

		+ ((u64) tk->wall_to_monotonic.tv_nsec << tk->tkr_mono.shift);

	nsecps = (u64) NSEC_PER_SEC << tk->tkr_mono.shift;

	while (vdso_data->wtom_clock_nsec >= nsecps) {

		vdso_data->wtom_clock_nsec -= nsecps;

		vdso_data->wtom_clock_sec++;
@@ -236,7 +236,7 @@ void update_vsyscall(struct timekeeper *tk) 


	vdso_data->xtime_coarse_sec = tk->xtime_sec;

	vdso_data->xtime_coarse_nsec =

		(long)(tk->tkr.xtime_nsec >> tk->tkr.shift);

		(long)(tk->tkr_mono.xtime_nsec >> tk->tkr_mono.shift);

	vdso_data->wtom_coarse_sec =

		vdso_data->xtime_coarse_sec + tk->wall_to_monotonic.tv_sec;

	vdso_data->wtom_coarse_nsec =
@@ -246,8 +246,8 @@ void update_vsyscall(struct timekeeper *tk) 
		vdso_data->wtom_coarse_sec++;

	}



	vdso_data->tk_mult = tk->tkr.mult;

	vdso_data->tk_shift = tk->tkr.shift;

	vdso_data->tk_mult = tk->tkr_mono.mult;

	vdso_data->tk_shift = tk->tkr_mono.shift;

	smp_wmb();

	++vdso_data->tb_update_count;

}

arch/tile/kernel/time.c

+12 −12
Original line number Diff line number Diff line
@@ -257,34 +257,34 @@ void update_vsyscall_tz(void) 


void update_vsyscall(struct timekeeper *tk)

{

	if (tk->tkr.clock != &cycle_counter_cs)

	if (tk->tkr_mono.clock != &cycle_counter_cs)

		return;



	write_seqcount_begin(&vdso_data->tb_seq);



	vdso_data->cycle_last		= tk->tkr.cycle_last;

	vdso_data->mask			= tk->tkr.mask;

	vdso_data->mult			= tk->tkr.mult;

	vdso_data->shift		= tk->tkr.shift;

	vdso_data->cycle_last		= tk->tkr_mono.cycle_last;

	vdso_data->mask			= tk->tkr_mono.mask;

	vdso_data->mult			= tk->tkr_mono.mult;

	vdso_data->shift		= tk->tkr_mono.shift;



	vdso_data->wall_time_sec	= tk->xtime_sec;

	vdso_data->wall_time_snsec	= tk->tkr.xtime_nsec;

	vdso_data->wall_time_snsec	= tk->tkr_mono.xtime_nsec;



	vdso_data->monotonic_time_sec	= tk->xtime_sec

					+ tk->wall_to_monotonic.tv_sec;

	vdso_data->monotonic_time_snsec	= tk->tkr.xtime_nsec

	vdso_data->monotonic_time_snsec	= tk->tkr_mono.xtime_nsec

					+ ((u64)tk->wall_to_monotonic.tv_nsec

						<< tk->tkr.shift);

						<< tk->tkr_mono.shift);

	while (vdso_data->monotonic_time_snsec >=

					(((u64)NSEC_PER_SEC) << tk->tkr.shift)) {

					(((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {

		vdso_data->monotonic_time_snsec -=

					((u64)NSEC_PER_SEC) << tk->tkr.shift;

					((u64)NSEC_PER_SEC) << tk->tkr_mono.shift;

		vdso_data->monotonic_time_sec++;

	}



	vdso_data->wall_time_coarse_sec	= tk->xtime_sec;

	vdso_data->wall_time_coarse_nsec = (long)(tk->tkr.xtime_nsec >>

						 tk->tkr.shift);

	vdso_data->wall_time_coarse_nsec = (long)(tk->tkr_mono.xtime_nsec >>

						 tk->tkr_mono.shift);



	vdso_data->monotonic_time_coarse_sec =

		vdso_data->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;

arch/x86/kernel/vsyscall_gtod.c

+12 −12
Original line number Diff line number Diff line
@@ -31,30 +31,30 @@ void update_vsyscall(struct timekeeper *tk) 
	gtod_write_begin(vdata);



	/* copy vsyscall data */

	vdata->vclock_mode	= tk->tkr.clock->archdata.vclock_mode;

	vdata->cycle_last	= tk->tkr.cycle_last;

	vdata->mask		= tk->tkr.mask;

	vdata->mult		= tk->tkr.mult;

	vdata->shift		= tk->tkr.shift;

	vdata->vclock_mode	= tk->tkr_mono.clock->archdata.vclock_mode;

	vdata->cycle_last	= tk->tkr_mono.cycle_last;

	vdata->mask		= tk->tkr_mono.mask;

	vdata->mult		= tk->tkr_mono.mult;

	vdata->shift		= tk->tkr_mono.shift;



	vdata->wall_time_sec		= tk->xtime_sec;

	vdata->wall_time_snsec		= tk->tkr.xtime_nsec;

	vdata->wall_time_snsec		= tk->tkr_mono.xtime_nsec;



	vdata->monotonic_time_sec	= tk->xtime_sec

					+ tk->wall_to_monotonic.tv_sec;

	vdata->monotonic_time_snsec	= tk->tkr.xtime_nsec

	vdata->monotonic_time_snsec	= tk->tkr_mono.xtime_nsec

					+ ((u64)tk->wall_to_monotonic.tv_nsec

						<< tk->tkr.shift);

						<< tk->tkr_mono.shift);

	while (vdata->monotonic_time_snsec >=

					(((u64)NSEC_PER_SEC) << tk->tkr.shift)) {

					(((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {

		vdata->monotonic_time_snsec -=

					((u64)NSEC_PER_SEC) << tk->tkr.shift;

					((u64)NSEC_PER_SEC) << tk->tkr_mono.shift;

		vdata->monotonic_time_sec++;

	}



	vdata->wall_time_coarse_sec	= tk->xtime_sec;

	vdata->wall_time_coarse_nsec	= (long)(tk->tkr.xtime_nsec >>

						 tk->tkr.shift);

	vdata->wall_time_coarse_nsec	= (long)(tk->tkr_mono.xtime_nsec >>

						 tk->tkr_mono.shift);



	vdata->monotonic_time_coarse_sec =

		vdata->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;

arch/x86/kvm/x86.c

+7 −7
Original line number Diff line number Diff line
@@ -1070,19 +1070,19 @@ static void update_pvclock_gtod(struct timekeeper *tk) 
	struct pvclock_gtod_data *vdata = &pvclock_gtod_data;

	u64 boot_ns;



	boot_ns = ktime_to_ns(ktime_add(tk->tkr.base_mono, tk->offs_boot));

	boot_ns = ktime_to_ns(ktime_add(tk->tkr_mono.base, tk->offs_boot));



	write_seqcount_begin(&vdata->seq);



	/* copy pvclock gtod data */

	vdata->clock.vclock_mode	= tk->tkr.clock->archdata.vclock_mode;

	vdata->clock.cycle_last		= tk->tkr.cycle_last;

	vdata->clock.mask		= tk->tkr.mask;

	vdata->clock.mult		= tk->tkr.mult;

	vdata->clock.shift		= tk->tkr.shift;

	vdata->clock.vclock_mode	= tk->tkr_mono.clock->archdata.vclock_mode;

	vdata->clock.cycle_last		= tk->tkr_mono.cycle_last;

	vdata->clock.mask		= tk->tkr_mono.mask;

	vdata->clock.mult		= tk->tkr_mono.mult;

	vdata->clock.shift		= tk->tkr_mono.shift;



	vdata->boot_ns			= boot_ns;

	vdata->nsec_base		= tk->tkr.xtime_nsec;

	vdata->nsec_base		= tk->tkr_mono.xtime_nsec;



	write_seqcount_end(&vdata->seq);

}