From 126d0210e9604209b55e18924bad0d2c6ce9bb96 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Wed, 1 Feb 2006 11:38:37 +0100
Subject: [PATCH] --- yaml --- r: 20261 b: refs/heads/master c:
 9d2725bb815d915fc6c8531097d9e71b579a8763 h: refs/heads/master i:   20259:
 7eaf0de9eb5d335d741545bc1beb2753f7ecae1b v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/i386/kernel/timers/timer_tsc.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c9bcceaf074..556ecfaf34b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4472cb3706ceea42797ae1dc79d624026986694
+refs/heads/master: 9d2725bb815d915fc6c8531097d9e71b579a8763
diff --git a/trunk/arch/i386/kernel/timers/timer_tsc.c b/trunk/arch/i386/kernel/timers/timer_tsc.c
index 47675bbbb316..591a642af884 100644
--- a/trunk/arch/i386/kernel/timers/timer_tsc.c
+++ b/trunk/arch/i386/kernel/timers/timer_tsc.c
@@ -272,6 +272,10 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 	if (val != CPUFREQ_RESUMECHANGE)
 		write_seqlock_irq(&xtime_lock);
 	if (!ref_freq) {
+		if (!freq->old){
+			ref_freq = freq->new;
+			goto end;
+		}
 		ref_freq = freq->old;
 		loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy;
 #ifndef CONFIG_SMP
@@ -297,6 +301,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 #endif
 	}
 
+end:
 	if (val != CPUFREQ_RESUMECHANGE)
 		write_sequnlock_irq(&xtime_lock);