提交 90ab9d55 编写于 作者: K K. Y. Srinivasan 提交者: H. Peter Anvin

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: NK. Y. Srinivasan <kys@microsoft.com>
Link: http://lkml.kernel.org/r/1381444224-3303-1-git-send-email-kys@microsoft.comSigned-off-by: NH. Peter Anvin <hpa@linux.intel.com>
上级 9e7827b5
...@@ -80,6 +80,7 @@ static void __init ms_hyperv_init_platform(void) ...@@ -80,6 +80,7 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n", printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n",
ms_hyperv.features, ms_hyperv.hints); ms_hyperv.features, ms_hyperv.hints);
#ifdef CONFIG_X86_LOCAL_APIC
if (ms_hyperv.features & HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) { if (ms_hyperv.features & HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) {
/* /*
* Get the APIC frequency. * Get the APIC frequency.
...@@ -99,6 +100,7 @@ static void __init ms_hyperv_init_platform(void) ...@@ -99,6 +100,7 @@ static void __init ms_hyperv_init_platform(void)
legacy_pic = &null_legacy_pic; legacy_pic = &null_legacy_pic;
} }
} }
#endif
if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE) if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100); clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
新手
引导
客服 返回
顶部