[tip: timers/vdso] x86/vdso: Delete asm/vdso/vsyscall.h inclusions

From: tip-bot2 for Thomas Weißschuh

Date: Thu Oct 15 2026 - 12:45:25 EST


The following commit has been merged into the timers/vdso branch of tip:

Commit-ID: 3086b69ee00f57a4b3c5735ce876801f25673aa7
Gitweb: https://git.kernel.org/tip/3086b69ee00f57a4b3c5735ce876801f25673aa7
Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
AuthorDate: Wed, 09 Sep 2026 10:51:23 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Thu, 15 Oct 2026 17:33:19 +02:00

x86/vdso: Delete asm/vdso/vsyscall.h inclusions

The inclusions are unnecessary, remove them.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20260909-vdso-asm-generic-vsyscall-h-v1-10-63ae856cc659@xxxxxxxxxxxxx
---
arch/x86/entry/vdso/common/vdso-layout.lds.S | 1 -
arch/x86/entry/vdso/vma.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/arch/x86/entry/vdso/common/vdso-layout.lds.S b/arch/x86/entry/vdso/common/vdso-layout.lds.S
index a1e30be..f190efb 100644
--- a/arch/x86/entry/vdso/common/vdso-layout.lds.S
+++ b/arch/x86/entry/vdso/common/vdso-layout.lds.S
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
#include <asm/vdso.h>
-#include <asm/vdso/vsyscall.h>
#include <vdso/datapage.h>

/*
diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index 18dfd80..4bd3b22 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -25,7 +25,6 @@
#include <asm/page.h>
#include <asm/desc.h>
#include <asm/cpufeature.h>
-#include <asm/vdso/vsyscall.h>
#include <clocksource/hyperv_timer.h>

static_assert(VDSO_NR_PAGES + VDSO_NR_VCLOCK_PAGES == __VDSO_PAGES);