From 4a0e881e0daa8747b00786331cecd1f23c3b8d37 Mon Sep 17 00:00:00 2001
From: Matt Mackall <mpm@selenic.com>
Date: Tue, 28 Mar 2006 01:56:09 -0800
Subject: [PATCH] --- yaml --- r: 24451 b: refs/heads/master c:
 4c2e6f6a06cdd239ec17e195e7868ce0171ea154 h: refs/heads/master i:   24449:
 340573ca85334af1c3ffb26754f96d479d4c0a21   24447:
 f6c0f687e90b7a3a3b71daf344d784cd0dc5ac16 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/alpha/kernel/time.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c23d7c84d1dd..bfc6e8fd4352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 356a9ce118879664ff88b76055b8bba115c1cc5e
+refs/heads/master: 4c2e6f6a06cdd239ec17e195e7868ce0171ea154
diff --git a/trunk/arch/alpha/kernel/time.c b/trunk/arch/alpha/kernel/time.c
index 6b2921be1909..3859749810b4 100644
--- a/trunk/arch/alpha/kernel/time.c
+++ b/trunk/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;