Skip to content

Commit

Permalink
x86, hyperv: Correctly guard the local APIC calibration code
Browse files Browse the repository at this point in the history
The code that gets the local APIC timer frequency from the hypervisor
rather depends on there being a local APIC.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Link: http://lkml.kernel.org/r/1381444224-3303-1-git-send-email-kys@microsoft.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
K. Y. Srinivasan authored and H. Peter Anvin committed Oct 10, 2013
1 parent 9e7827b commit 90ab9d5
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/kernel/cpu/mshyperv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
Expand Down

0 comments on commit 90ab9d5

Please sign in to comment.