diff options
| author | Elliott Hughes <enh@google.com> | 2012-04-16 14:26:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-04-16 14:26:43 -0700 |
| commit | f848321c4feb0a8b194a2148c3a9d6d65280f924 (patch) | |
| tree | 87cf90cc1e952a4eb705c521bc9e56620f7d4181 | |
| parent | 8ecb4770a0a046e753e16d51d31371b827d20cf1 (diff) | |
| parent | ef9876569aa5c772439b883a7ee68aa207c98d1e (diff) | |
| download | bionic-f848321c4feb0a8b194a2148c3a9d6d65280f924.tar.gz | |
resolved conflicts for merge of ef987656 to master
Change-Id: I3854de8f4cddaf344444efa6f9da027642a237d9
| -rw-r--r-- | libc/SYSCALLS.TXT | 2 | ||||
| -rw-r--r-- | libc/arch-x86/syscalls/clock_nanosleep.S | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 5604582c3..1923ea037 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -183,7 +183,7 @@ int nanosleep(const struct timespec *, struct timespec *) 162 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 diff --git a/libc/arch-x86/syscalls/clock_nanosleep.S b/libc/arch-x86/syscalls/clock_nanosleep.S index c400e3ffe..23e1e6f04 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 @@ clock_nanosleep: addl $4, %esp orl $-1, %eax 1: + popl %esi + popl %edx popl %ecx popl %ebx ret |