Messages in this thread Patch in this message | | | From | lantianyu1986@gmail ... | Subject | [PATCH] x86/Hyper-V: Fix build error with CONFIG_HYPERV_TSCPAGE=N | Date | Thu, 22 Aug 2019 13:38:52 +0800 |
| |
From: Tianyu Lan <Tianyu.Lan@microsoft.com>
Both Hyper-V tsc page and Hyper-V tsc MSR code use variable hv_sched_clock_offset for their sched clock callback and so define the variable regardless of CONFIG_HYPERV_TSCPAGE setting.
Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com> --- This patch is based on the top of "git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core".
drivers/clocksource/hyperv_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c index dad8af198e20..c322ab4d3689 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -22,6 +22,7 @@ #include <asm/mshyperv.h> static struct clock_event_device __percpu *hv_clock_event; +static u64 hv_sched_clock_offset __ro_after_init; /* * If false, we're using the old mechanism for stimer0 interrupts @@ -215,7 +216,6 @@ EXPORT_SYMBOL_GPL(hyperv_cs); #ifdef CONFIG_HYPERV_TSCPAGE static struct ms_hyperv_tsc_page tsc_pg __aligned(PAGE_SIZE); -static u64 hv_sched_clock_offset __ro_after_init; struct ms_hyperv_tsc_page *hv_get_tsc_page(void) { -- 2.14.5
| |