Don't call gettimeofday vsyscall in x86-64 sem_timedwait

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index caae5dc..9d066c6 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-06  Ulrich Drepper  <drepper@gmail.com>
+
+       * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (sem_timedwait): Don't
+       use gettimeofday vsyscall, just call gettimeofday.
+
 2011-09-05  David S. Miller  <davem@davemloft.net>
 
        * sysdeps/unix/sysv/linux/sem_timedwait.c (do_futex_timed_wait):

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
index ca49cb8..2926b36 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002,2003,2005,2007,2009,2010 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2003,2005,2007,2009,2010,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -24,10 +24,6 @@
 #include <pthread-errnos.h>
 #include <structsem.h>
 
-
-/* For the calculation see asm/vsyscall.h.  */
-#define VSYSCALL_ADDR_vgettimeofday    0xffffffffff600000
-
        .text
 
        .globl  sem_timedwait
@@ -212,9 +208,10 @@ sem_timedwait:
        addq    $1, NWAITERS(%r12)
 
 7:     xorl    %esi, %esi
-       movq    %rsp, %rdi
-       movq    $VSYSCALL_ADDR_vgettimeofday, %rax
-       callq   *%rax
+       movq    %rsp,%rdi
+       /* This call works because we directly jump to a system call entry
+          which preserves all the registers.  */
+       call    JUMPTARGET(__gettimeofday)
 
        /* Compute relative timeout.  */
        movq    8(%rsp), %rax