The following commit has been merged into the timers/vdso branch of tip: Commit-ID: c0fba50a1e672629588c28ed70f01d516c1e1b27 Gitweb: https://git.kernel.org/tip/c0fba50a1e672629588c28ed70f01d516c1e1b27 Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx> AuthorDate: Thu, 10 Oct 2024 17:44:52 +02:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 15 Oct 2024 17:50:29 +02:00 MIPS: vdso: Remove timekeeper includes 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-9-7fe5a3ea4382@xxxxxxxxxxxxx --- arch/mips/include/asm/vdso/vsyscall.h | 1 - arch/mips/kernel/vdso.c | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/mips/include/asm/vdso/vsyscall.h b/arch/mips/include/asm/vdso/vsyscall.h index 47168aa..a458287 100644 --- a/arch/mips/include/asm/vdso/vsyscall.h +++ b/arch/mips/include/asm/vdso/vsyscall.h @@ -4,7 +4,6 @@ #ifndef __ASSEMBLY__ -#include <linux/timekeeper_internal.h> #include <vdso/datapage.h> extern struct vdso_data *vdso_data; diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index dda36fa..4c8e3c0 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -14,7 +14,6 @@ #include <linux/random.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/timekeeper_internal.h> #include <asm/abi.h> #include <asm/mips-cps.h>
|