summaryrefslogtreecommitdiff
path: root/include/clocksource
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-09-20 17:56:58 +0300
committerMark Brown <broonie@kernel.org>2021-09-21 17:23:35 +0300
commitffb1e76f4f32d2b8ea4189df0484980370476395 (patch)
treec62376eab558809973dc5b71806df07c388bfc1a /include/clocksource
parent2bab94090b01bc593d8bc25f68df41f198721173 (diff)
parente4e737bb5c170df6135a127739a9e6148ee3da82 (diff)
downloadlinux-ffb1e76f4f32d2b8ea4189df0484980370476395.tar.xz
Merge tag 'v5.15-rc2' into spi-5.15
Linux 5.15-rc2
Diffstat (limited to 'include/clocksource')
-rw-r--r--include/clocksource/hyperv_timer.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/clocksource/hyperv_timer.h b/include/clocksource/hyperv_timer.h
index b6774aa5a4b8..b3f5d73ae1d6 100644
--- a/include/clocksource/hyperv_timer.h
+++ b/include/clocksource/hyperv_timer.h
@@ -20,6 +20,8 @@
#define HV_MAX_MAX_DELTA_TICKS 0xffffffff
#define HV_MIN_DELTA_TICKS 1
+#ifdef CONFIG_HYPERV_TIMER
+
/* Routines called by the VMbus driver */
extern int hv_stimer_alloc(bool have_percpu_irqs);
extern int hv_stimer_cleanup(unsigned int cpu);
@@ -28,8 +30,6 @@ extern void hv_stimer_legacy_cleanup(unsigned int cpu);
extern void hv_stimer_global_cleanup(void);
extern void hv_stimer0_isr(void);
-#ifdef CONFIG_HYPERV_TIMER
-extern u64 (*hv_read_reference_counter)(void);
extern void hv_init_clocksource(void);
extern struct ms_hyperv_tsc_page *hv_get_tsc_page(void);
@@ -100,6 +100,13 @@ static inline u64 hv_read_tsc_page_tsc(const struct ms_hyperv_tsc_page *tsc_pg,
{
return U64_MAX;
}
+
+static inline int hv_stimer_cleanup(unsigned int cpu) { return 0; }
+static inline void hv_stimer_legacy_init(unsigned int cpu, int sint) {}
+static inline void hv_stimer_legacy_cleanup(unsigned int cpu) {}
+static inline void hv_stimer_global_cleanup(void) {}
+static inline void hv_stimer0_isr(void) {}
+
#endif /* CONFIG_HYPERV_TIMER */
#endif