Skip to contentSkip to conversation

s390: Cleanup xtime usage in s390 code

PATCH In review John Stultz 2 participants 2 messages Mar 5, 2010 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390: Cleanup xtime usage in s390 code

This replaces direct xtime usage in the s390 arch with timekeeping accessors, so we can further clean up the timekeeping core.

Uncompiled and untested.

Cc Martin Schwidefsky <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 arch/s390/kernel/time.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
arch/s390/kernel/time.c +5 -5
index a8f93f1..8b22e7f 100644
@@ -73,15 +73,15 @@ unsigned long long monotonic_clock(void)
 }
 EXPORT_SYMBOL(monotonic_clock);
 
-void tod_to_timeval(__u64 todval, struct timespec *xtime)
+void tod_to_timeval(__u64 todval, struct timespec *xt)
 {
 	unsigned long long sec;
 
 	sec = todval >> 12;
 	do_div(sec, 1000000);
-	xtime->tv_sec = sec;
+	xt->tv_sec = sec;
 	todval -= (sec * 1000000) << 12;
-	xtime->tv_nsec = ((todval * 1000) >> 12);
+	xt->tv_nsec = ((todval * 1000) >> 12);
 }
 EXPORT_SYMBOL(tod_to_timeval);
 
@@ -216,8 +216,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
 	++vdso_data->tb_update_count;
 	smp_wmb();
 	vdso_data->xtime_tod_stamp = clock->cycle_last;
-	vdso_data->xtime_clock_sec = xtime.tv_sec;
-	vdso_data->xtime_clock_nsec = xtime.tv_nsec;
+	vdso_data->xtime_clock_sec = wall_time->tv_sec;
+	vdso_data->xtime_clock_nsec = wall_time->tv_nsec;
 	vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;
 	vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;
 	smp_wmb();
Signature · 1 line
1.6.0.4
#1 lore raw
Quoted 4 lines · On Thu, 4 Mar 2010 18:36:35 -0800 John Stultz <[email protected]> wrote:

This replaces direct xtime usage in the s390 arch with timekeeping accessors, so we can further clean up the timekeeping core.

Uncompiled and untested.

Compiles and works. I'll add it to the git390 tree for the next please pull

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.