From: john stultz <johnstul@us.ibm.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>, Helge Deller <deller@gmx.de>,
"James E.J. Bottomley" <jejb@parisc-linux.org>,
linux-parisc@vger.kernel.org
Subject: [RFC][PATCH 12/14] Convert parisc to read/update_persistent_clock
Date: Tue, 22 Dec 2009 20:14:03 -0800 [thread overview]
Message-ID: <1261541643.3508.74.camel@localhost.localdomain> (raw)
In-Reply-To: <1261541567.3508.73.camel@localhost.localdomain>
This patch converts the parisc 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>
---
time.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
Index: gettimeoffset/arch/parisc/kernel/time.c
===================================================================
--- gettimeoffset.orig/arch/parisc/kernel/time.c 2009-12-22 18:50:55.000000000 -0800
+++ gettimeoffset/arch/parisc/kernel/time.c 2009-12-22 18:51:06.000000000 -0800
@@ -250,9 +250,21 @@ static int __init rtc_init(void)
}
module_init(rtc_init);
-void __init time_init(void)
+void read_persistent_clock(struct timespec *ts)
{
static struct pdc_tod tod_data;
+ if (pdc_tod_read(&tod_data) == 0) {
+ ts->tv_sec = tod_data.tod_sec;
+ ts->tv_nsec = tod_data.tod_usec * 1000;
+ } else {
+ printk(KERN_ERR "Error reading tod clock\n");
+ ts->tv_sec = 0;
+ ts->tv_nsec = 0;
+ }
+}
+
+void __init time_init(void)
+{
unsigned long current_cr16_khz;
clocktick = (100 * PAGE0->mem_10msec) / HZ;
@@ -264,19 +276,4 @@ void __init time_init(void)
clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz,
clocksource_cr16.shift);
clocksource_register(&clocksource_cr16);
-
- if (pdc_tod_read(&tod_data) == 0) {
- unsigned long flags;
-
- write_seqlock_irqsave(&xtime_lock, flags);
- xtime.tv_sec = tod_data.tod_sec;
- xtime.tv_nsec = tod_data.tod_usec * 1000;
- set_normalized_timespec(&wall_to_monotonic,
- -xtime.tv_sec, -xtime.tv_nsec);
- write_sequnlock_irqrestore(&xtime_lock, flags);
- } else {
- printk(KERN_ERR "Error reading tod clock\n");
- xtime.tv_sec = 0;
- xtime.tv_nsec = 0;
- }
}
next prev parent reply other threads:[~2009-12-23 4:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-23 3:59 [RFC][PATCH 0/14] Convert remaining arches " john stultz
2009-12-23 4:00 ` [RFC][PATCH 1/14] Convert alpha " john stultz
2009-12-23 4:01 ` [RFC][PATCH 2/14] Convert arm " john stultz
2009-12-23 4:03 ` [RFC][PATCH 3/14] Convert avr32 " john stultz
2009-12-23 4:04 ` [RFC][PATCH 4/14] Convert blackfin " john stultz
2009-12-23 4:05 ` [RFC][PATCH 5/14] Convert cris " john stultz
2009-12-23 4:06 ` [RFC][PATCH 6/14] Convert frv " john stultz
2009-12-23 4:08 ` [RFC][PATCH 7/14] Convert h8300 " john stultz
2009-12-23 4:09 ` [RFC][PATCH 8/14] Convert ia64 " john stultz
2009-12-23 4:10 ` [RFC][PATCH 9/14] Convert m32r " john stultz
2009-12-23 4:11 ` [RFC][PATCH 10/14] Convert m68k " john stultz
2009-12-23 4:12 ` [RFC][PATCH 11/14] Convert mn10300 " john stultz
2009-12-23 4:14 ` john stultz [this message]
2009-12-23 4:15 ` [RFC][PATCH 13/14] Convert sh " john stultz
2009-12-23 4:16 ` [RFC][PATCH 14/14] Convert sparc " john stultz
2009-12-24 4:52 ` David Miller
2010-01-05 16:41 ` Kristoffer Glembo
2010-01-05 17:08 ` [RFC][PATCH 11/14] Convert mn10300 " David Howells
2010-01-05 16:47 ` [RFC][PATCH 6/14] Convert frv " David Howells
2009-12-24 11:09 ` [RFC][PATCH 2/14] Convert arm " Uwe Kleine-König
2009-12-23 5:08 ` [RFC][PATCH 0/14] Convert remaining arches " Paul Mundt
2009-12-23 10:08 ` Geert Uytterhoeven
2009-12-23 22:04 ` john stultz
2009-12-24 0:27 ` Dialup Jon Norstog
2009-12-24 4:54 ` David Miller
2009-12-24 5:10 ` Paul Mundt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261541643.3508.74.camel@localhost.localdomain \
--to=johnstul@us.ibm.com \
--cc=deller@gmx.de \
--cc=jejb@parisc-linux.org \
--cc=kyle@mcmartin.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome