From: Tianyu Lan <Tianyu.Lan@microsoft.com>
Date: Wed, 28 Aug 2019 16:07:47 +0800
Patch-mainline: v5.4-rc1
Subject: x86/hyperv: Hide pv_ops access for CONFIG_PARAVIRT=n
Git-commit: 41cfe2a2a7f4fad5647031ad3a1da166452b5437
References: fate#323887
hv_setup_sched_clock() references pv_ops which is only available when
CONFIG_PARAVIRT=Y.
Wrap it into a #ifdef
Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190828080747.204419-1-Tianyu.Lan@microsoft.com
Acked-by: Olaf Hering <ohering@suse.de>
---
arch/x86/kernel/cpu/mshyperv.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -346,7 +346,9 @@ static void __init ms_hyperv_init_platform(void)
void hv_setup_sched_clock(void *sched_clock)
{
+#ifdef CONFIG_PARAVIRT
pv_ops.time.sched_clock = sched_clock;
+#endif
}
const __initconst struct hypervisor_x86 x86_hyper_ms_hyperv = {