Commit-ID: ca1e631c3acf80bc5f5934ce9054a9b4880c96e1
Gitweb: http://git.kernel.org/tip/ca1e631c3acf80bc5f5934ce9054a9b4880c96e1
Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
AuthorDate: Thu, 16 Jan 2014 13:00:21 -0800
Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Thu, 16 Jan 2014 13:00:21 -0800
x86, tsc, apic: Unbreak static (MSR) calibration when CONFIG_X86_LOCAL_APIC=n
If we aren't going to use the local APIC anyway, we obviously don't
care about its timer frequency.
Link: http://lkml.kernel.org/r/tip-rgm7xmg7k6qnjlw3ynkcjsmh@xxxxxxxxxxxxxx
Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Bin Gao <bin.gao@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
arch/x86/kernel/tsc_msr.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index c502772..8b5434f 100644
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -118,8 +118,10 @@ int try_msr_calibrate_tsc(unsigned long *fast_calibrate)
*fast_calibrate = freq * ratio;
pr_info("TSC runs at %lu KHz\n", *fast_calibrate);
+#ifdef CONFIG_X86_LOCAL_APIC
lapic_timer_frequency = (freq * 1000) / HZ;
pr_info("lapic_timer_frequency = %d\n", lapic_timer_frequency);
+#endif
return 1;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|