summaryrefslogtreecommitdiff
path: root/include/clocksource
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2022-11-14 00:21:15 +0300
committerThomas Gleixner <tglx@linutronix.de>2022-11-17 15:58:32 +0300
commite5dfd093eca01a5d8d967f959a2372d7d82eb59c (patch)
treea9e32f5541221acadf6586b2a18da8b637e5f41e /include/clocksource
parent094226ad94f471a9f19e8f8e7140a09c2625abaa (diff)
downloadlinux-e5dfd093eca01a5d8d967f959a2372d7d82eb59c.tar.xz
clocksource/drivers/hyper-v: Include asm/hyperv-tlfs.h not asm/mshyperv.h
clocksource/hyperv_timer.h is included into the VDSO build. It includes asm/mshyperv.h which in turn includes the world and some more. This worked so far by chance, but any subtle change in the include chain results in a build breakage because VDSO builds are building user space libraries. Include asm/hyperv-tlfs.h instead which contains everything what the VDSO build needs except the hv_get_raw_timer() define. Move this define into a separate header file, which contains the prerequisites (msr.h) and is included by clocksource/hyperv_timer.h. Fixup drivers/hv/vmbus_drv.c which relies on the indirect include of asm/mshyperv.h. With that the VDSO build only pulls in the minimum requirements. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Michael Kelley <mikelley@microsoft.com> Link: https://lore.kernel.org/r/87fsemtut0.ffs@tglx
Diffstat (limited to 'include/clocksource')
-rw-r--r--include/clocksource/hyperv_timer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/clocksource/hyperv_timer.h b/include/clocksource/hyperv_timer.h
index b3f5d73ae1d6..b4a3935801ca 100644
--- a/include/clocksource/hyperv_timer.h
+++ b/include/clocksource/hyperv_timer.h
@@ -15,13 +15,15 @@
#include <linux/clocksource.h>
#include <linux/math64.h>
-#include <asm/mshyperv.h>
+#include <asm/hyperv-tlfs.h>
#define HV_MAX_MAX_DELTA_TICKS 0xffffffff
#define HV_MIN_DELTA_TICKS 1
#ifdef CONFIG_HYPERV_TIMER
+#include <asm/hyperv_timer.h>
+
/* Routines called by the VMbus driver */
extern int hv_stimer_alloc(bool have_percpu_irqs);
extern int hv_stimer_cleanup(unsigned int cpu);