diff options
author | Matt Mackall <mpm@selenic.com> | 2006-03-28 04:56:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 12:16:01 -0500 |
commit | 4c2e6f6a06cdd239ec17e195e7868ce0171ea154 (patch) | |
tree | 7cd4cd9d37570330a67b94de17ad6766c8f1deda | |
parent | 356a9ce118879664ff88b76055b8bba115c1cc5e (diff) |
[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>
-rw-r--r-- | arch/alpha/kernel/time.c | 3 |
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) | |||
314 | if (!est_cycle_freq) | 314 | if (!est_cycle_freq) |
315 | est_cycle_freq = validate_cc_value(calibrate_cc_with_pit()); | 315 | est_cycle_freq = validate_cc_value(calibrate_cc_with_pit()); |
316 | 316 | ||
317 | cc1 = rpcc_after_update_in_progress(); | 317 | cc1 = rpcc(); |
318 | 318 | ||
319 | /* Calibrate CPU clock -- attempt #2. */ | 319 | /* Calibrate CPU clock -- attempt #2. */ |
320 | if (!est_cycle_freq) { | 320 | if (!est_cycle_freq) { |
321 | cc1 = rpcc_after_update_in_progress(); | ||
321 | cc2 = rpcc_after_update_in_progress(); | 322 | cc2 = rpcc_after_update_in_progress(); |
322 | est_cycle_freq = validate_cc_value(cc2 - cc1); | 323 | est_cycle_freq = validate_cc_value(cc2 - cc1); |
323 | cc1 = cc2; | 324 | cc1 = cc2; |