From: Andy Lutomirski <luto@amacapital.net>
Date: Sat, 29 Mar 2014 20:15:35 +0000 (-0700)
Subject: x86, vdso: Fix the symbol versions on the 32-bit vDSO
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=37c975545ec63320789962bf307f000f08fabd48;p=deliverable%2Flinux.git

x86, vdso: Fix the symbol versions on the 32-bit vDSO

The new symbols provide the same API as the 64-bit variants, so they
should have the same symbol version name.  This can't break
userspace, since these symbols are new for 32-bit Linux.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Stefani Seibold <stefani@seibold.net>
Link: http://lkml.kernel.org/r/0a869bce03d25619565b1eee7d69a4fd15fd203a.1396124118.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/vdso/vdso32/vdso32.lds.S b/arch/x86/vdso/vdso32/vdso32.lds.S
index 28c460703bbc..aadb8b9994cd 100644
--- a/arch/x86/vdso/vdso32/vdso32.lds.S
+++ b/arch/x86/vdso/vdso32/vdso32.lds.S
@@ -23,14 +23,18 @@ ENTRY(__kernel_vsyscall);
  */
 VERSION
 {
+	LINUX_2.6 {
+	global:
+		__vdso_clock_gettime;
+		__vdso_gettimeofday;
+		__vdso_time;
+	};
+
 	LINUX_2.5 {
 	global:
 		__kernel_vsyscall;
 		__kernel_sigreturn;
 		__kernel_rt_sigreturn;
-		__vdso_clock_gettime;
-		__vdso_gettimeofday;
-		__vdso_time;
 	local: *;
 	};
 }