summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-03-29 13:15:35 -0700
committerH. Peter Anvin <hpa@zytor.com>2014-03-30 10:08:38 -0700
commit37c975545ec63320789962bf307f000f08fabd48 (patch)
tree31ff4742f5a1c6d852172d264cc4e959011e836f
parentb9a4a56c1e5c72eac92d18aa48250a8c965632be (diff)
downloadlinux-37c975545ec63320789962bf307f000f08fabd48.tar.bz2
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>
-rw-r--r--arch/x86/vdso/vdso32/vdso32.lds.S10
1 files changed, 7 insertions, 3 deletions
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: *;
};
}