[tip:timers/cleanup] ia64: Convert ia64 to use read/update_persistent_clock

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: tip-bot for John Stultz
Date: Friday, March 12, 2010 - 5:20 pm

Commit-ID:  6ffdc5774a9ef80e58db398a8307d5b2db2644ce
Gitweb:     http://git.kernel.org/tip/6ffdc5774a9ef80e58db398a8307d5b2db2644ce
Author:     John Stultz <johnstul@us.ibm.com>
AuthorDate: Wed, 3 Mar 2010 19:57:22 -0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 13 Mar 2010 01:14:11 +0100

ia64: Convert ia64 to use read/update_persistent_clock

This patch converts the ia64 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: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1267675049-12337-8-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/ia64/kernel/time.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 47a1927..653b3c4 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -430,18 +430,16 @@ static int __init rtc_init(void)
 }
 module_init(rtc_init);
 
+void read_persistent_clock(struct timespec *ts)
+{
+	efi_gettimeofday(ts);
+}
+
 void __init
 time_init (void)
 {
 	register_percpu_irq(IA64_TIMER_VECTOR, &timer_irqaction);
-	efi_gettimeofday(&xtime);
 	ia64_init_itm();
-
-	/*
-	 * Initialize wall_to_monotonic such that adding it to xtime will yield zero, the
-	 * tv_nsec field must be normalized (i.e., 0 <= nsec < NSEC_PER_SEC).
-	 */
-	set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
 }
 
 /*
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: [PATCH 14/14] arm: Convert arm to use read_persistent_ ..., Russell King - ARM Linux, (Thu Mar 4, 2:36 am)
[tip:timers/cleanup] alpha: Convert alpha to use read/upda ..., tip-bot for John Stultz, (Fri Mar 12, 5:19 pm)
[tip:timers/cleanup] mn10300: Convert mn10300 to use read/ ..., tip-bot for John Stultz, (Fri Mar 12, 5:19 pm)
[tip:timers/cleanup] frv: Convert frv to use read/update_p ..., tip-bot for John Stultz, (Fri Mar 12, 5:19 pm)
[tip:timers/cleanup] h8300: Convert h8300 to use read/upda ..., tip-bot for John Stultz, (Fri Mar 12, 5:20 pm)
[tip:timers/cleanup] avr32: Convert avr32 to use read/upda ..., tip-bot for John Stultz, (Fri Mar 12, 5:20 pm)
[tip:timers/cleanup] ia64: Convert ia64 to use read/update ..., tip-bot for John Stultz, (Fri Mar 12, 5:20 pm)
[tip:timers/cleanup] blackfin: Convert blackfin to use rea ..., tip-bot for John Stultz, (Fri Mar 12, 5:20 pm)
[tip:timers/cleanup] m32r: Convert m32r to use read/update ..., tip-bot for John Stultz, (Fri Mar 12, 5:21 pm)
[tip:timers/cleanup] m68k: Convert m68k to use read/update ..., tip-bot for John Stultz, (Fri Mar 12, 5:21 pm)
[tip:timers/cleanup] cris: Convert cris to use read/update ..., tip-bot for John Stultz, (Fri Mar 12, 5:21 pm)