x86, tsc, apic: Unbreak static (MSR) calibration when CONFIG_X86_LOCAL_APIC=n

H. Peter Anvin · H. Peter Anvin · commit ca1e631c3acf · 2014-01-16T13:00:21.000-08:00
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@git.kernel.org Reported-by: Fengguang Wu <fengguang.wu@intel.com> Cc: Bin Gao <bin.gao@intel.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,10 @@ int try_msr_calibrate_tsc(unsigned long *fast_calibrate)`
`118`	`118`	`fast_calibrate = freq ratio;`
`119`	`119`	`pr_info("TSC runs at %lu KHz\n", *fast_calibrate);`
`120`	`120`
	`121`	`+#ifdef CONFIG_X86_LOCAL_APIC`
`121`	`122`	`lapic_timer_frequency = (freq * 1000) / HZ;`
`122`	`123`	`pr_info("lapic_timer_frequency = %d\n", lapic_timer_frequency);`
	`124`	`+#endif`
`123`	`125`
`124`	`126`	`return 1;`
`125`	`127`	`}`