summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/vdso.h
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-03-20 18:57:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2014-03-20 20:20:08 -0700
commit9e6f450f946d35d585798da268d45c679632fe05 (patch)
tree733e5945b5efc2be040da323ec2c17c1100525d3 /arch/x86/include/asm/vdso.h
parentb67e612cef1e5964efc6fa99fb7ad3d31c4db01a (diff)
downloadop-kernel-dev-9e6f450f946d35d585798da268d45c679632fe05.zip
op-kernel-dev-9e6f450f946d35d585798da268d45c679632fe05.tar.gz
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: 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>
Diffstat (limited to 'arch/x86/include/asm/vdso.h')
-rw-r--r--arch/x86/include/asm/vdso.h38
1 files changed, 38 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index 0301d78..7622a65 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -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 */
OpenPOWER on IntegriCloud