[PATCH] linux-2.6.5-rc2_cpukhz-fix_A1

From: john stultz
Date: Wed Mar 24 2004 - 18:47:15 EST

Andrew, All,
This small patch insures 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.

A0: Original release
A1: Whitespace fix suggested by pavel@xxxxxxx

Andrew: Please consider for inclusion into your tree for further


diff -Nru a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
--- a/arch/i386/kernel/timers/timer_tsc.c Wed Mar 24 15:35:23 2004
+++ b/arch/i386/kernel/timers/timer_tsc.c Wed Mar 24 15:35:23 2004
@@ -360,8 +360,9 @@
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);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/