Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e6f450f authored by Andy Lutomirski's avatar Andy Lutomirski Committed by H. Peter Anvin
Browse files

x86, vdso: Move more vdso definitions into vdso.h 



This fixes the Xen build and gets rid of a silly header file.

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Cc: Stefani Seibold <stefani@seibold.net>
Link: http://lkml.kernel.org/r/1df77311795aff75f5742c787d277518314a38d3.1395366931.git.luto@amacapital.net


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent b67e612c

arch/x86/include/asm/vdso.h

+38 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_VDSO_H

#define _ASM_X86_VDSO_H



#include <asm/page_types.h>

#include <linux/linkage.h>



#ifdef __ASSEMBLER__



#define DEFINE_VDSO_IMAGE(symname, filename)				\

__PAGE_ALIGNED_DATA ;							\

	.globl symname##_start, symname##_end ;				\

	.align PAGE_SIZE ;						\

	symname##_start: ;						\

	.incbin filename ;						\

	symname##_end: ;						\

	.align PAGE_SIZE /* extra data here leaks to userspace. */ ;	\

									\

.previous ;								\

									\

	.globl symname##_pages ;					\

	.bss ;								\

	.align 8 ;							\

	.type symname##_pages, @object ;				\

	symname##_pages: ;						\

	.zero (symname##_end - symname##_start + PAGE_SIZE - 1) / PAGE_SIZE * (BITS_PER_LONG / 8) ; \

	.size symname##_pages, .-symname##_pages



#else



#define DECLARE_VDSO_IMAGE(symname)				\

	extern char symname##_start[], symname##_end[];		\

	extern struct page *symname##_pages[]



#if defined CONFIG_X86_32 || defined CONFIG_COMPAT



#include <asm/vdso32.h>



DECLARE_VDSO_IMAGE(vdso32_int80);

#ifdef CONFIG_COMPAT

DECLARE_VDSO_IMAGE(vdso32_syscall);

#endif

DECLARE_VDSO_IMAGE(vdso32_sysenter);



extern const char VDSO32_PRELINK[];



/*
@@ -27,4 +63,6 @@ extern void __user __kernel_rt_sigreturn; 


void __init patch_vdso32(void *vdso, size_t len);



#endif /* __ASSEMBLER__ */



#endif /* _ASM_X86_VDSO_H */

arch/x86/vdso/vdso.S

+1 −1
Original line number Diff line number Diff line 
#include "vdso_image.h"

#include <asm/vdso.h>



DEFINE_VDSO_IMAGE(vdso, "arch/x86/vdso/vdso.so")

arch/x86/vdso/vdso32-setup.c

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <asm/fixmap.h>

#include <asm/hpet.h>

#include <asm/vvar.h>

#include "vdso_image.h"



#ifdef CONFIG_COMPAT_VDSO

#define VDSO_DEFAULT	0
@@ -42,12 +41,6 @@ 
#define arch_setup_additional_pages	syscall32_setup_pages

#endif



DECLARE_VDSO_IMAGE(vdso32_int80);

#ifdef CONFIG_COMPAT

DECLARE_VDSO_IMAGE(vdso32_syscall);

#endif

DECLARE_VDSO_IMAGE(vdso32_sysenter);



/*

 * Should the kernel map a VDSO page into processes and pass its

 * address down to glibc upon exec()?

arch/x86/vdso/vdso32.S

+1 −1
Original line number Diff line number Diff line 
#include "vdso_image.h"

#include <asm/vdso.h>



DEFINE_VDSO_IMAGE(vdso32_int80, "arch/x86/vdso/vdso32-int80.so")

arch/x86/vdso/vdso_image.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#ifndef _VDSO_IMAGE_H

#define _VDSO_IMAGE_H



#include <asm/page_types.h>

#include <linux/linkage.h>



#define DEFINE_VDSO_IMAGE(symname, filename)				\

__PAGE_ALIGNED_DATA ;							\

	.globl symname##_start, symname##_end ;				\

	.align PAGE_SIZE ;						\

	symname##_start: ;						\

	.incbin filename ;						\

	symname##_end: ;						\

	.align PAGE_SIZE /* extra data here leaks to userspace. */ ;	\

									\

.previous ;								\

									\

	.globl symname##_pages ;					\

	.bss ;								\

	.align 8 ;							\

	.type symname##_pages, @object ;				\

	symname##_pages: ;						\

	.zero (symname##_end - symname##_start + PAGE_SIZE - 1) / PAGE_SIZE * (BITS_PER_LONG / 8) ; \

	.size symname##_pages, .-symname##_pages



#define DECLARE_VDSO_IMAGE(symname)				\

	extern char symname##_start[], symname##_end[];		\

	extern struct page *symname##_pages[]



#endif /* _VDSO_IMAGE_H */