commit d515ce465be909d830a39462c3f196b5d7f35c66
author Jack Ren <jack.ren@intel.com> Tue Apr 17 11:20:15 2012 +0800
committer Jack Ren <jack.ren@intel.com> Mon Apr 16 23:53:05 2012 +0800
tree 707c0067ad2351d96bba6fd19f14e04e5223514c
parent 6bc18fa58849a4307cf6ddcfd526d9258e8175fc

Bionic: Fix wrong prototype of system call clock_nanosleep

In bionic/libc/SYSCALLS.TXT, the prototype of system call
clock_nanosleep is incorrect.

According to man page:
int clock_nanosleep(clockid_t clock_id, int flags,
                    const struct timespec *request,
                    struct timespec *remain);

Change-Id: Ic44c6db3d632293aa17998035554eacd664c2d57
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

libc/SYSCALLS.TXT

diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT
index 2da38b7..333efba 100644
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -181,7 +181,7 @@
 int           clock_gettime(clockid_t clk_id, struct timespec *tp)    263,265
 int           clock_settime(clockid_t clk_id, const struct timespec *tp)  262,264
 int           clock_getres(clockid_t clk_id, struct timespec *res)   264,266
-int           clock_nanosleep(const struct timespec *req, struct timespec *rem)  265,267
+int           clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *req, struct timespec *rem)  265,267
 int           getitimer(int, const struct itimerval *)   105
 int           setitimer(int, const struct itimerval *, struct itimerval *)  104
 int           __timer_create:timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)    257,259

libc/arch-x86/syscalls/clock_nanosleep.S

diff --git a/libc/arch-x86/syscalls/clock_nanosleep.S b/libc/arch-x86/syscalls/clock_nanosleep.S
index c400e3f..23e1e6f 100644
--- a/libc/arch-x86/syscalls/clock_nanosleep.S
+++ b/libc/arch-x86/syscalls/clock_nanosleep.S
@@ -9,8 +9,12 @@
 clock_nanosleep:
     pushl   %ebx
     pushl   %ecx
-    mov     12(%esp), %ebx
-    mov     16(%esp), %ecx
+    pushl   %edx
+    pushl   %esi
+    mov     20(%esp), %ebx
+    mov     24(%esp), %ecx
+    mov     28(%esp), %edx
+    mov     32(%esp), %esi
     movl    $__NR_clock_nanosleep, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -21,6 +25,8 @@
     addl    $4, %esp
     orl     $-1, %eax
 1:
+    popl    %esi
+    popl    %edx
     popl    %ecx
     popl    %ebx
     ret

libc/include/sys/linux-unistd.h

diff --git a/libc/include/sys/linux-unistd.h b/libc/include/sys/linux-unistd.h
index d945d87..8422d7e 100644
--- a/libc/include/sys/linux-unistd.h
+++ b/libc/include/sys/linux-unistd.h
@@ -142,7 +142,7 @@
 int              clock_gettime (clockid_t clk_id, struct timespec *tp);
 int              clock_settime (clockid_t clk_id, const struct timespec *tp);
 int              clock_getres (clockid_t clk_id, struct timespec *res);
-int              clock_nanosleep (const struct timespec *req, struct timespec *rem);
+int              clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, struct timespec *rem);
 int              getitimer (int, const struct itimerval *);
 int              setitimer (int, const struct itimerval *, struct itimerval *);
 int              __timer_create (clockid_t clockid, struct sigevent *evp, timer_t *timerid);