Skip to content

Commit 75ceb49

Browse files
t-8chKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent c3a190d commit 75ceb49

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
#include <asm/vdso.h>
3+
#include <asm/vdso/vsyscall.h>
34

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
#ifndef __ASM_VDSO_VSYSCALL_H
33
#define __ASM_VDSO_VSYSCALL_H
44

5+
#define __VDSO_RND_DATA_OFFSET 640
6+
57
#ifndef __ASSEMBLY__
68

79
#include <vdso/datapage.h>
810
#include <asm/vgtod.h>
9-
#include <asm/vvar.h>
1011

1112
extern struct vdso_data *vdso_data;
1213

arch/x86/include/asm/vvar.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#ifndef _ASM_X86_VVAR_H
2020
#define _ASM_X86_VVAR_H
2121

22-
#define __VDSO_RND_DATA_OFFSET 640
23-
2422
#ifdef EMIT_VVAR
2523
/*
2624
* EMIT_VVAR() is used by the kernel linker script to put vvars in the

0 commit comments

Comments
 (0)