diff options
Diffstat (limited to 'arch/tile/kernel/time.c')
| -rw-r--r-- | arch/tile/kernel/time.c | 13 | 
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index 462dcd0c1700..d8fbc289e680 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -260,9 +260,8 @@ void update_vsyscall_tz(void)  void update_vsyscall(struct timekeeper *tk)  { -	struct timespec wall_time = tk_xtime(tk);  	struct timespec *wtm = &tk->wall_to_monotonic; -	struct clocksource *clock = tk->clock; +	struct clocksource *clock = tk->tkr.clock;  	if (clock != &cycle_counter_cs)  		return; @@ -270,13 +269,13 @@ void update_vsyscall(struct timekeeper *tk)  	/* Userspace gettimeofday will spin while this value is odd. */  	++vdso_data->tb_update_count;  	smp_wmb(); -	vdso_data->xtime_tod_stamp = clock->cycle_last; -	vdso_data->xtime_clock_sec = wall_time.tv_sec; -	vdso_data->xtime_clock_nsec = wall_time.tv_nsec; +	vdso_data->xtime_tod_stamp = tk->tkr.cycle_last; +	vdso_data->xtime_clock_sec = tk->xtime_sec; +	vdso_data->xtime_clock_nsec = tk->tkr.xtime_nsec;  	vdso_data->wtom_clock_sec = wtm->tv_sec;  	vdso_data->wtom_clock_nsec = wtm->tv_nsec; -	vdso_data->mult = clock->mult; -	vdso_data->shift = clock->shift; +	vdso_data->mult = tk->tkr.mult; +	vdso_data->shift = tk->tkr.shift;  	smp_wmb();  	++vdso_data->tb_update_count;  }  |