[patch] P4 clock mod: recalibrate_cpu_khz on ia32 only

[Frederik Deweerdt]

Hello Dave,

I just triggered the following compile error with an old .config on
x86_64, (latest git):

  CHK     include/linux/version.h
  CHK     include/linux/utsrelease.h
  SYMLINK include/asm -> include/asm-x86
  CALL    scripts/checksyscalls.sh
  CHK     include/linux/compile.h
  CC [M]  arch/x86/kernel/cpu/cpufreq/p4-clockmod.o
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c: In function âcpufreq_p4_cpu_initâ:
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c:232: error: implicit declaration of function ârecalibrate_cpu_khzâ
make[3]: *** [arch/x86/kernel/cpu/cpufreq/p4-clockmod.o] Error 1
make[2]: *** [arch/x86/kernel/cpu/cpufreq] Error 2
make[1]: *** [arch/x86/kernel/cpu] Error 2
make: *** [arch/x86/kernel] Error 2

The attached patch calls recalibrate_cpu_khz on ia32 only

Regards,
Frederik

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xxxxxxxxx>


diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index 41ed949..88be236 100644
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@ -229,7 +229,9 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
 	    c->x86_model < 2) {
 		/* switch to maximum frequency and measure result */
 		cpufreq_p4_setdc(policy->cpu, DC_DISABLE);
+#ifdef CONFIG_X86_32
 		recalibrate_cpu_khz();
+#endif
 	}
 	/* get max frequency */
 	stock_freq = cpufreq_p4_get_frequency(c);
--
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/