From 675d6a0be34f103b74cc59a37a1f0af8a031f86f Mon Sep 17 00:00:00 2001 From: John Stultz Date: Wed, 3 Mar 2010 19:57:20 -0800 Subject: [PATCH] --- yaml --- r: 192219 b: refs/heads/master c: 12833c1e373ad2b12667ca159d335fae29968473 h: refs/heads/master i: 192217: 8bac0a901fbfe0ec3baef56e6235e31c8e998016 192215: c5fc38cfae713c85bc5eb571a7747783d157d12e v: v3 --- [refs] | 2 +- trunk/arch/h8300/kernel/time.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e8877646825f..627879f068e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 739b27116a0e6903d6c85d6769e69f43d8fa4128 +refs/heads/master: 12833c1e373ad2b12667ca159d335fae29968473 diff --git a/trunk/arch/h8300/kernel/time.c b/trunk/arch/h8300/kernel/time.c index 7f2d6cfbb4b6..165005aff9df 100644 --- a/trunk/arch/h8300/kernel/time.c +++ b/trunk/arch/h8300/kernel/time.c @@ -41,7 +41,7 @@ void h8300_timer_tick(void) update_process_times(user_mode(get_irq_regs())); } -void __init time_init(void) +void read_persistent_clock(struct timespec *ts) { unsigned int year, mon, day, hour, min, sec; @@ -56,8 +56,12 @@ void __init time_init(void) #endif if ((year += 1900) < 1970) year += 100; - xtime.tv_sec = mktime(year, mon, day, hour, min, sec); - xtime.tv_nsec = 0; + ts->tv_sec = mktime(year, mon, day, hour, min, sec); + ts->tv_nsec = 0; +} + +void __init time_init(void) +{ h8300_timer_setup(); }