Skip to content

Commit

Permalink
x86, vdso: Fix the symbol versions on the 32-bit vDSO
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Lutomirski authored and H. Peter Anvin committed Mar 30, 2014
1 parent b9a4a56 commit 37c9755
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions arch/x86/vdso/vdso32/vdso32.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -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: *;
};
}
Expand Down

0 comments on commit 37c9755

Please sign in to comment.