Most architectures define the vDSO page macros in asm/vdso.h. Align the x86 headers.
Signed-off-by: Thomas Weißschuh <[email protected]> --- 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 4e735158c1b2..071e4a262b50 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 57598db8763b..65d10f4cc718 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> -- 2.55.0
