diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2013-10-10 15:30:24 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-10-10 15:21:38 -0700 |
| commit | 90ab9d5510932e146a9443bf5a591f95d5b5ada8 (patch) | |
| tree | 51d3ee615a4eb282c10b57d6489f444d9bd45d3e /arch/x86/kernel/cpu | |
| parent | 9e7827b5ea4ca93b4d864bc07c0fafb838d496b1 (diff) | |
| download | talos-obmc-linux-90ab9d5510932e146a9443bf5a591f95d5b5ada8.tar.gz talos-obmc-linux-90ab9d5510932e146a9443bf5a591f95d5b5ada8.zip | |
x86, hyperv: Correctly guard the local APIC calibration code
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>
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | 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 0a490ca278e7..628ff50ab75f 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); |
