Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2013-01-25 09:31:01 +0100
committerOlaf Hering <ohering@suse.de>2013-01-25 09:31:01 +0100
commit8061aa999541807be5ed60a0e5f909732146b569 (patch)
tree9a35ea085ea6a5ff622d7a3dfed263c7b2a7db03
parentc0316071e49369c83a8016c34b5c7fcd37653481 (diff)
- patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch:rpm-3.0.58-0.6.2
x86: Hyper-V: register clocksource only if its advertised (bnc#792500). suse-commit: cdbd6a79cc96a0e386fc7fb1adefff631356e6ac
-rw-r--r--arch/x86/kernel/cpu/mshyperv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 0a630dd4b620..646d192b18a2 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -68,7 +68,8 @@ 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);
- clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
+ if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
+ clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {