x86, vdso: Move the vvar area before the vdso text

[pandora-kernel.git] / arch / x86 / include / asm / vdso.h

diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index d1dc554..8021bd2 100644 (file)
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -3,63 +3,51 @@
 
 #include <asm/page_types.h>
 #include <linux/linkage.h>
+#include <linux/init.h>
 
-#ifdef __ASSEMBLER__
+#ifndef __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
+#include <linux/mm_types.h>
 
-#else
+struct vdso_image {
+       void *data;
+       unsigned long size;   /* Always a multiple of PAGE_SIZE */
 
-#define DECLARE_VDSO_IMAGE(symname)                            \
-       extern char symname##_start[], symname##_end[];         \
-       extern struct page *symname##_pages[]
+       /* text_mapping.pages is big enough for data/size page pointers */
+       struct vm_special_mapping text_mapping;
 
-#if defined CONFIG_X86_32 || defined CONFIG_COMPAT
+       unsigned long alt, alt_len;
 
-#include <asm/vdso32.h>
+       long sym_vvar_start;  /* Negative offset to the vvar area */
 
-DECLARE_VDSO_IMAGE(vdso32_int80);
-#ifdef CONFIG_COMPAT
-DECLARE_VDSO_IMAGE(vdso32_syscall);
+       long sym_vvar_page;
+       long sym_hpet_page;
+       long sym_VDSO32_NOTE_MASK;
+       long sym___kernel_sigreturn;
+       long sym___kernel_rt_sigreturn;
+       long sym___kernel_vsyscall;
+       long sym_VDSO32_SYSENTER_RETURN;
+};
+
+#ifdef CONFIG_X86_64
+extern const struct vdso_image vdso_image_64;
+#endif
+
+#ifdef CONFIG_X86_X32
+extern const struct vdso_image vdso_image_x32;
 #endif
-DECLARE_VDSO_IMAGE(vdso32_sysenter);
 
-/*
- * Given a pointer to the vDSO image, find the pointer to VDSO32_name
- * as that symbol is defined in the vDSO sources or linker script.
- */
-#define VDSO32_SYMBOL(base, name)                                      \
-({                                                                     \
-       extern const char VDSO32_##name[];                              \
-       (void __user *)(VDSO32_##name + (unsigned long)(base));         \
-})
+#if defined CONFIG_X86_32 || defined CONFIG_COMPAT
+extern const struct vdso_image vdso_image_32_int80;
+#ifdef CONFIG_COMPAT
+extern const struct vdso_image vdso_image_32_syscall;
 #endif
+extern const struct vdso_image vdso_image_32_sysenter;
 
-/*
- * These symbols are defined with the addresses in the vsyscall page.
- * See vsyscall-sigreturn.S.
- */
-extern void __user __kernel_sigreturn;
-extern void __user __kernel_rt_sigreturn;
+extern const struct vdso_image *selected_vdso32;
+#endif
 
-void __init patch_vdso32(void *vdso, size_t len);
+extern void __init init_vdso_image(const struct vdso_image *image);
 
 #endif /* __ASSEMBLER__ */