[tip:x86/vdso] x86, vdso: Fix the symbol versions on the 32-bit vDSO
From: tip-bot for Andy Lutomirski
Date: Sun Mar 30 2014 - 13:29:40 EST
Commit-ID: 37c975545ec63320789962bf307f000f08fabd48
Gitweb: http://git.kernel.org/tip/37c975545ec63320789962bf307f000f08fabd48
Author: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
AuthorDate: Sat, 29 Mar 2014 13:15:35 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Sun, 30 Mar 2014 10:08:38 -0700
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@xxxxxxxxxxxxxx>
Cc: Stefani Seibold <stefani@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/0a869bce03d25619565b1eee7d69a4fd15fd203a.1396124118.git.luto@xxxxxxxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/vdso/vdso32/vdso32.lds.S | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/vdso/vdso32/vdso32.lds.S b/arch/x86/vdso/vdso32/vdso32.lds.S
index 28c4607..aadb8b9 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: *;
};
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/