aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2009-08-14 09:47:26 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-15 04:55:46 -0400
commit155ec60226ae0ae2aadaa57c951a58a359331030 (patch)
treefdee05f7b587f8d49cdd277abdbe44212279a4ba /arch
parentc55c87c892c1875deace0c8fc28787335277fdf2 (diff)
timekeeping: Introduce struct timekeeper
Add struct timekeeper to keep the internal values timekeeping.c needs in regard to the currently selected clock source. This moves the timekeeping intervals, xtime_nsec and the ntp error value from struct clocksource to struct timekeeper. The raw_time is removed from the clocksource as well. It gets treated like xtime as a global variable. Eventually xtime raw_time should be moved to struct timekeeper. [ tglx: minor cleanup ] Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Ingo Molnar <mingo@elte.hu> Acked-by: John Stultz <johnstul@us.ibm.com> Cc: Daniel Walker <dwalker@fifo99.com> LKML-Reference: <20090814134809.613209842@de.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/time.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index afefe514df0f..e76c2e7a8b9a 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -280,7 +280,6 @@ void __init time_init(void)
280 now = get_clock(); 280 now = get_clock();
281 tod_to_timeval(now - TOD_UNIX_EPOCH, &xtime); 281 tod_to_timeval(now - TOD_UNIX_EPOCH, &xtime);
282 clocksource_tod.cycle_last = now; 282 clocksource_tod.cycle_last = now;
283 clocksource_tod.raw_time = xtime;
284 tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, &ts); 283 tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, &ts);
285 set_normalized_timespec(&wall_to_monotonic, -ts.tv_sec, -ts.tv_nsec); 284 set_normalized_timespec(&wall_to_monotonic, -ts.tv_sec, -ts.tv_nsec);
286 write_sequnlock_irqrestore(&xtime_lock, flags); 285 write_sequnlock_irqrestore(&xtime_lock, flags);