summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>2024-10-10 09:01:19 +0200
committerThomas Gleixner <tglx@linutronix.de>2024-11-02 12:37:34 +0100
commit75ceb49add376f3a37e96a278bdedc029afd0716 (patch)
treeca62f128cb1ec985f44ffbea5fd94f9ffb5fe732 /arch/x86/include/asm
parentx86/vdso: Access rng vdso data without vvar.h (diff)
downloadlinux-75ceb49add376f3a37e96a278bdedc029afd0716.tar.xz
linux-75ceb49add376f3a37e96a278bdedc029afd0716.zip
x86/vdso: Move the rng offset to vsyscall.h
vvar.h will go away, so move the last useful bit into vsyscall.h. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-17-b64f0842d512@linutronix.de
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/vdso/vsyscall.h3
-rw-r--r--arch/x86/include/asm/vvar.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h
index aac7d2b7b9a8..6a933f0dacf1 100644
--- a/arch/x86/include/asm/vdso/vsyscall.h
+++ b/arch/x86/include/asm/vdso/vsyscall.h
@@ -2,11 +2,12 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
+#define __VDSO_RND_DATA_OFFSET 640
+
#ifndef __ASSEMBLY__
#include <vdso/datapage.h>
#include <asm/vgtod.h>
-#include <asm/vvar.h>
extern struct vdso_data *vdso_data;
diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h
index b605914f4d43..d95cf92296ef 100644
--- a/arch/x86/include/asm/vvar.h
+++ b/arch/x86/include/asm/vvar.h
@@ -19,8 +19,6 @@
#ifndef _ASM_X86_VVAR_H
#define _ASM_X86_VVAR_H
-#define __VDSO_RND_DATA_OFFSET 640
-
#ifdef EMIT_VVAR
/*
* EMIT_VVAR() is used by the kernel linker script to put vvars in the