Messages in this thread Patch in this message | | | From | "K. Y. Srinivasan" <> | Subject | [PATCH 1/1] X86: hypev: Correctly guard the local APIC calibration code. | Date | Thu, 10 Oct 2013 15:30:24 -0700 |
| |
Correctly guard the code that gets the local APIC timer frequency from the hypervisor.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> --- arch/x86/kernel/cpu/mshyperv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index 0a490ca..628ff50 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -80,6 +80,7 @@ static void __init ms_hyperv_init_platform(void) printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n", ms_hyperv.features, ms_hyperv.hints); +#ifdef CONFIG_X86_LOCAL_APIC if (ms_hyperv.features & HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) { /* * Get the APIC frequency. @@ -99,6 +100,7 @@ static void __init ms_hyperv_init_platform(void) legacy_pic = &null_legacy_pic; } } +#endif if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE) clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100); -- 1.7.4.1
| |