mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Stultz <johnstul@us.ibm.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: John Stultz <johnstul@us.ibm.com>,
	"David S. Miller" <davem@davemloft.net>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 4/6] sparc: convert to clocksource_register_hz/khz
Date: Tue, 15 Feb 2011 22:34:50 -0800	[thread overview]
Message-ID: <1297838092-22989-5-git-send-email-johnstul@us.ibm.com> (raw)
In-Reply-To: <1297838092-22989-1-git-send-email-johnstul@us.ibm.com>

This converts the sparc clocksources to use clocksource_register_hz/khz

This is untested, so any assistance in testing would be appreciated!

CC: "David S. Miller" <davem@davemloft.net>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
---
 arch/sparc/kernel/time_64.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 3bc9c99..58aa27b 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -816,14 +816,12 @@ void __init time_init(void)
 		clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT);
 
 	clocksource_tick.name = tick_ops->name;
-	clocksource_calc_mult_shift(&clocksource_tick, freq, 4);
 	clocksource_tick.read = clocksource_tick_read;
 
+	clocksource_register_hz(&clocksource_tick, freq);
 	printk("clocksource: mult[%x] shift[%d]\n",
 	       clocksource_tick.mult, clocksource_tick.shift);
 
-	clocksource_register(&clocksource_tick);
-
 	sparc64_clockevent.name = tick_ops->name;
 	clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4);
 
-- 
1.7.3.2.146.gca209


  parent reply	other threads:[~2011-02-16  6:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-16  6:34 [PATCH 0/6] clocksource_register_hz/khz cleanups for 2.6.39 John Stultz
2011-02-16  6:34 ` [PATCH 1/6] x86: Convert untested clocksources to clocksource_register_hz/khz John Stultz
2011-02-16  6:34 ` [PATCH 2/6] ia64: convert " John Stultz
2011-02-16 17:52   ` Tony Luck
2011-02-16  6:34 ` [PATCH 3/6] alpha: convert to clocksource_register_hz John Stultz
2011-03-23 20:50   ` Matt Turner
2011-02-16  6:34 ` John Stultz [this message]
2011-02-23 21:26   ` [PATCH 4/6] sparc: convert to clocksource_register_hz/khz David Miller
2011-02-23 22:17     ` john stultz
2011-02-16  6:34 ` [PATCH 5/6] mips: " John Stultz
2011-02-16  6:34 ` [PATCH 6/6] blackfin: convert to clocksource_register_hz John Stultz

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=1297838092-22989-5-git-send-email-johnstul@us.ibm.com \
    --to=johnstul@us.ibm.com \
    --cc=davem@davemloft.net \
    --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

all inboxes | Powered by JetHome®