The following commit has been merged into the timers/vdso branch of tip: Commit-ID: 9025e3a6ecfcd9c9036778aa833211026c5ccf8b Gitweb: https://git.kernel.org/tip/9025e3a6ecfcd9c9036778aa833211026c5ccf8b Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx> AuthorDate: Thu, 10 Oct 2024 17:44:50 +02:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 15 Oct 2024 17:50:29 +02:00 x86/vdso: Remove timekeeper include Since the generic VDSO clock mode storage is used, this header file is unused and can be removed. This avoids including a non-VDSO header while building the VDSO, which can lead to compilation errors. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/all/20241010-vdso-generic-arch_update_vsyscall-v1-7-7fe5a3ea4382@xxxxxxxxxxxxx --- arch/x86/include/asm/vdso/vsyscall.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h index 67fedf1..a1f916b 100644 --- a/arch/x86/include/asm/vdso/vsyscall.h +++ b/arch/x86/include/asm/vdso/vsyscall.h @@ -4,7 +4,6 @@ #ifndef __ASSEMBLY__ -#include <linux/timekeeper_internal.h> #include <vdso/datapage.h> #include <asm/vgtod.h> #include <asm/vvar.h>
|