[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <156698820683.8007.9582744413346389871.tip-bot2@tip-bot2>
Date: Wed, 28 Aug 2019 10:30:06 -0000
From: "tip-bot2 for Tianyu Lan" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Tianyu Lan <Tianyu.Lan@...rosoft.com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>,
linux-kernel@...r.kernel.org
Subject: [tip: timers/core] x86/hyperv: Hide pv_ops access for CONFIG_PARAVIRT=n
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 41cfe2a2a7f4fad5647031ad3a1da166452b5437
Gitweb: https://git.kernel.org/tip/41cfe2a2a7f4fad5647031ad3a1da166452b5437
Author: Tianyu Lan <Tianyu.Lan@...rosoft.com>
AuthorDate: Wed, 28 Aug 2019 16:07:47 +08:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Wed, 28 Aug 2019 12:25:06 +02:00
x86/hyperv: Hide pv_ops access for CONFIG_PARAVIRT=n
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@...rosoft.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lkml.kernel.org/r/20190828080747.204419-1-Tianyu.Lan@microsoft.com
---
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
index 53afd33..267daad 100644
--- 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 = {
Powered by blists - more mailing lists