[PATCH] adjuct cpu_khz in response to cpufreq changes

From: john stultz <johnstul@us.ibm.com>

This patch ensures that cpu_khz is adjusted on cpufreq notifications even
when the tsc timesource is not in use.  It fixes the mostly cosmetic issue
when using the ACPI PM timesource of /proc/cpuinfo not being properly
updated when cpu frequency was lowered.

diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
index 39fe12730d02f103e438529412490e1102c8f812..370c568067ff63100625a8f5e4c9992dd64d78d0 100644 (file)
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
@@ -360,8 +360,9 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
                if (variable_tsc)
                        cpu_data[freq->cpu].loops_per_jiffy = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
 #ifndef CONFIG_SMP
-               if (use_tsc) {
+               if (cpu_khz)
                        cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq->new);
+               if (use_tsc) {
                        if (variable_tsc) {
                                fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_ref, freq->new, ref_freq);
                                set_cyc2ns_scale(cpu_khz/1000);