---

yaml --- r: 24451 b: refs/heads/master c: 4c2e6f6 h: refs/heads/master i: 24449: 340573c 24447: f6c0f68 v: v3
git-mirror · Mar 28, 2006 · 4a0e881 · 4a0e881
1 parent 6782863
commit 4a0e881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;