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@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>
This commit is contained in:
parent
7da7c15613
commit
ca1e631c3a
1 changed files with 2 additions and 0 deletions
|
@ -118,8 +118,10 @@ int try_msr_calibrate_tsc(unsigned long *fast_calibrate)
|
||||||
*fast_calibrate = freq * ratio;
|
*fast_calibrate = freq * ratio;
|
||||||
pr_info("TSC runs at %lu KHz\n", *fast_calibrate);
|
pr_info("TSC runs at %lu KHz\n", *fast_calibrate);
|
||||||
|
|
||||||
|
#ifdef CONFIG_X86_LOCAL_APIC
|
||||||
lapic_timer_frequency = (freq * 1000) / HZ;
|
lapic_timer_frequency = (freq * 1000) / HZ;
|
||||||
pr_info("lapic_timer_frequency = %d\n", lapic_timer_frequency);
|
pr_info("lapic_timer_frequency = %d\n", lapic_timer_frequency);
|
||||||
|
#endif
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue