Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 03:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Andy 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: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Andy Lutomirski 2014-03-20 18:57:18 -07:00 committed by H. Peter Anvin
parent b67e612cef
commit 9e6f450f94
7 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/x86/include/asm/vdso.h
View File

@ -1,10 +1,46 @@
#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 */

2
arch/x86/vdso/vdso.S
View File

@ -1,3 +1,3 @@
#include "vdso_image.h"
#include <asm/vdso.h>
DEFINE_VDSO_IMAGE(vdso, "arch/x86/vdso/vdso.so")

7
arch/x86/vdso/vdso32-setup.c
View File

@ -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()?

2
arch/x86/vdso/vdso32.S
View File

@ -1,4 +1,4 @@
#include "vdso_image.h"
#include <asm/vdso.h>
DEFINE_VDSO_IMAGE(vdso32_int80, "arch/x86/vdso/vdso32-int80.so")

30
arch/x86/vdso/vdso_image.h
View File

@ -1,30 +0,0 @@
#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 */

2
arch/x86/vdso/vdsox32.S
View File

@ -1,3 +1,3 @@
#include "vdso_image.h"
#include <asm/vdso.h>
DEFINE_VDSO_IMAGE(vdsox32, "arch/x86/vdso/vdsox32.so")

1
arch/x86/vdso/vma.c
View File

@ -15,7 +15,6 @@
#include <asm/proto.h>
#include <asm/vdso.h>
#include <asm/page.h>
#include "vdso_image.h"
#if defined(CONFIG_X86_64)
unsigned int __read_mostly vdso_enabled = 1;