summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-13 19:10:43 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-13 19:10:43 -0800
commit934a3595b30c986bab52bc9c08d12c8962c88c8a (patch)
tree1aa2acda1b45d97ce7b4027327a23a2a3c8dc81a /arch/i386
parentb4d9eda028e8becbb5057b554e63eea12e496a88 (diff)
parent7d5e350fab47f1273bc8b52d5f133ed6e4baeb7f (diff)
downloadop-kernel-dev-934a3595b30c986bab52bc9c08d12c8962c88c8a.zip
op-kernel-dev-934a3595b30c986bab52bc9c08d12c8962c88c8a.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/timers/timer_tsc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
index 7c86e3c..a7f5a2a 100644
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
@@ -282,6 +282,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
@@ -307,6 +311,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
#endif
}
+end:
if (val != CPUFREQ_RESUMECHANGE)
write_sequnlock_irq(&xtime_lock);
OpenPOWER on IntegriCloud