Messages in this thread Patch in this message | | | Date | Sat, 13 Mar 2010 00:20:03 GMT | From | tip-bot for John Stultz <> | Subject | [tip:timers/cleanup] h8300: Convert h8300 to use read/update_persistent_clock |
| |
Commit-ID: 12833c1e373ad2b12667ca159d335fae29968473 Gitweb: http://git.kernel.org/tip/12833c1e373ad2b12667ca159d335fae29968473 Author: John Stultz <johnstul@us.ibm.com> AuthorDate: Wed, 3 Mar 2010 19:57:20 -0800 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Sat, 13 Mar 2010 01:14:10 +0100
h8300: Convert h8300 to use read/update_persistent_clock
This patch converts the h8300 architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future.
I have not built or tested this patch, so help from arch maintainers would be appreciated.
Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <1267675049-12337-6-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/h8300/kernel/time.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c index 7f2d6cf..165005a 100644 --- a/arch/h8300/kernel/time.c +++ b/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(); }
| |