summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorMatt Mackall <mpm@selenic.com>2006-03-28 01:56:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 09:16:01 -0800
commit4c2e6f6a06cdd239ec17e195e7868ce0171ea154 (patch)
tree7cd4cd9d37570330a67b94de17ad6766c8f1deda /arch/alpha
parent356a9ce118879664ff88b76055b8bba115c1cc5e (diff)
downloadlinux-4c2e6f6a06cdd239ec17e195e7868ce0171ea154.tar.bz2
[PATCH] RTC: Remove RTC UIP synchronization on Alpha
The sync may still be needed for CPU clock calibration but we don't sync in the regular case. Signed-off-by: Matt Mackall <mpm@selenic.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/kernel/time.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 6b2921be1909..3859749810b4 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -314,10 +314,11 @@ time_init(void)
if (!est_cycle_freq)
est_cycle_freq = validate_cc_value(calibrate_cc_with_pit());
- cc1 = rpcc_after_update_in_progress();
+ cc1 = rpcc();
/* Calibrate CPU clock -- attempt #2. */
if (!est_cycle_freq) {
+ cc1 = rpcc_after_update_in_progress();
cc2 = rpcc_after_update_in_progress();
est_cycle_freq = validate_cc_value(cc2 - cc1);
cc1 = cc2;