Commit 75ceb49a authored Oct 10, 2024 by Thomas Weißschuh Committed by Thomas Gleixner Nov 02, 2024

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

parent c3a190d4

arch/x86/entry/vdso/vdso-layout.lds.S

+1 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#include <asm/vdso.h>
		#include <asm/vdso/vsyscall.h>

		/*
		* Linker script for vDSO. This is an ELF shared object prelinked to

arch/x86/include/asm/vdso/vsyscall.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/include/asm/vvar.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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