From: John Stultz <john.stultz@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: John Stultz <johnstul@us.ibm.com>, Jeff Dike <jdike@addtoit.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 3/6] clocksource: um: convert to clocksource_register_hz/khz
Date: Wed, 1 Jun 2011 00:32:47 -0700 [thread overview]
Message-ID: <1306913570-9445-4-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1306913570-9445-1-git-send-email-john.stultz@linaro.org>
From: John Stultz <johnstul@us.ibm.com>
This converts the um clocksource to use clocksource_register_hz/khz
This is untested, so any assistance in testing would be appreciated!
CC: Jeff Dike <jdike@addtoit.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
---
arch/um/kernel/time.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index a08d9fa..82a6e22 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -75,8 +75,6 @@ static struct clocksource itimer_clocksource = {
.rating = 300,
.read = itimer_read,
.mask = CLOCKSOURCE_MASK(64),
- .mult = 1000,
- .shift = 0,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@ -94,9 +92,9 @@ static void __init setup_itimer(void)
clockevent_delta2ns(60 * HZ, &itimer_clockevent);
itimer_clockevent.min_delta_ns =
clockevent_delta2ns(1, &itimer_clockevent);
- err = clocksource_register(&itimer_clocksource);
+ err = clocksource_register_hz(&itimer_clocksource, USEC_PER_SEC);
if (err) {
- printk(KERN_ERR "clocksource_register returned %d\n", err);
+ printk(KERN_ERR "clocksource_register_hz returned %d\n", err);
return;
}
clockevents_register_device(&itimer_clockevent);
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2011-06-01 7:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 7:32 [PATCH 0/6] clocksource_register_hz/khz cleanups John Stultz
2011-06-01 7:32 ` [PATCH 1/6] clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz John Stultz
2011-06-01 7:32 ` [PATCH 2/6] clocksource: parisc: convert to clocksource_register_hz/khz John Stultz
2011-06-01 7:32 ` John Stultz [this message]
2011-06-01 7:32 ` [PATCH 4/6] clocksource: xtensa: " John Stultz
2011-06-01 7:32 ` [PATCH 5/6] clocksource: cris: convert to clocksource_register_khz John Stultz
2011-06-01 7:32 ` [PATCH 6/6] clocksource: tile: convert to use clocksource_register_hz John Stultz
2011-06-01 16:18 ` Chris Metcalf
2011-06-01 17:55 ` john stultz
2011-06-03 21:27 ` Chris Metcalf
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=1306913570-9445-4-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=jdike@addtoit.com \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).