x86, vdso: Finish removing VDSO32_PRELINK

[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 fddb53d..d1dc554 100644 (file)
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -1,8 +1,45 @@
 #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
-extern const char VDSO32_PRELINK[];
+
+#include <asm/vdso32.h>
+
+DECLARE_VDSO_IMAGE(vdso32_int80);
+#ifdef CONFIG_COMPAT
+DECLARE_VDSO_IMAGE(vdso32_syscall);
+#endif
+DECLARE_VDSO_IMAGE(vdso32_sysenter);
 
 /*
  * Given a pointer to the vDSO image, find the pointer to VDSO32_name
@@ -11,8 +48,7 @@ extern const char VDSO32_PRELINK[];
 #define VDSO32_SYMBOL(base, name)                                      \
 ({                                                                     \
        extern const char VDSO32_##name[];                              \
-       (void __user *)(VDSO32_##name - VDSO32_PRELINK +                \
-                       (unsigned long)(base));                         \
+       (void __user *)(VDSO32_##name + (unsigned long)(base));         \
 })
 #endif
 
@@ -23,12 +59,8 @@ extern const char VDSO32_PRELINK[];
 extern void __user __kernel_sigreturn;
 extern void __user __kernel_rt_sigreturn;
 
-/*
- * These symbols are defined by vdso32.S to mark the bounds
- * of the ELF DSO images included therein.
- */
-extern const char vdso32_int80_start, vdso32_int80_end;
-extern const char vdso32_syscall_start, vdso32_syscall_end;
-extern const char vdso32_sysenter_start, vdso32_sysenter_end;
+void __init patch_vdso32(void *vdso, size_t len);
+
+#endif /* __ASSEMBLER__ */
 
 #endif /* _ASM_X86_VDSO_H */