x86, vdso: Reimplement vdso.so preparation in build-time C

[deliverable/linux.git] / arch / x86 / include / asm / elf.h

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index e96df2c0dd6910a343d2754821373d923d698105..65b21bcbe9f7fa16eae5962ce2778821859ed9c9 100644 (file)
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -299,7 +299,7 @@ do {                                                                        \
 do {                                                                   \
        if (vdso64_enabled)                                             \
                NEW_AUX_ENT(AT_SYSINFO_EHDR,                            \
-                           (unsigned long)current->mm->context.vdso);  \
+                           (unsigned long __force)current->mm->context.vdso); \
 } while (0)
 
 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
@@ -307,7 +307,7 @@ do {                                                                        \
 do {                                                                   \
        if (vdso64_enabled)                                             \
                NEW_AUX_ENT(AT_SYSINFO_EHDR,                            \
-                           (unsigned long)current->mm->context.vdso);  \
+                           (unsigned long __force)current->mm->context.vdso); \
 } while (0)
 
 #define AT_SYSINFO             32
@@ -325,7 +325,8 @@ else                                                                        \
 #define VDSO_CURRENT_BASE      ((unsigned long)current->mm->context.vdso)
 
 #define VDSO_ENTRY                                                     \
-       ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
+       ((unsigned long)current->mm->context.vdso +                     \
+        selected_vdso32->sym___kernel_vsyscall)
 
 struct linux_binprm;