[tip: timers/vdso] x86/vdso: Move vDSO page definitions to asm/vdso.h
From: tip-bot2 for Thomas Weißschuh
Date: Thu Oct 15 2026 - 12:34:16 EST
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 8051a0f482e6039b257f534a39d820547e7c82bd
Gitweb: https://git.kernel.org/tip/8051a0f482e6039b257f534a39d820547e7c82bd
Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
AuthorDate: Wed, 09 Sep 2026 10:51:19 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Thu, 15 Oct 2026 17:33:19 +02:00
x86/vdso: Move vDSO page definitions to asm/vdso.h
Most architectures define the vDSO page macros in asm/vdso.h.
Align the x86 headers.
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-6-63ae856cc659@xxxxxxxxxxxxx
---
arch/x86/include/asm/vdso.h | 7 +++++++
arch/x86/include/asm/vdso/vsyscall.h | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index 4e73515..071e4a2 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -6,6 +6,13 @@
#include <linux/linkage.h>
#include <linux/init.h>
+#define __VDSO_PAGES 6
+
+#define VDSO_NR_VCLOCK_PAGES 2
+#define VDSO_VCLOCK_PAGES_START(_b) ((_b) + (__VDSO_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE)
+#define VDSO_PAGE_PVCLOCK_OFFSET 0
+#define VDSO_PAGE_HVCLOCK_OFFSET 1
+
#ifndef __ASSEMBLER__
#include <linux/mm_types.h>
diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h
index 57598db..65d10f4 100644
--- a/arch/x86/include/asm/vdso/vsyscall.h
+++ b/arch/x86/include/asm/vdso/vsyscall.h
@@ -2,13 +2,6 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
-#define __VDSO_PAGES 6
-
-#define VDSO_NR_VCLOCK_PAGES 2
-#define VDSO_VCLOCK_PAGES_START(_b) ((_b) + (__VDSO_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE)
-#define VDSO_PAGE_PVCLOCK_OFFSET 0
-#define VDSO_PAGE_HVCLOCK_OFFSET 1
-
#ifndef __ASSEMBLER__
#include <vdso/datapage.h>