summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-02-10 00:10:39 +0000
committerUlrich Drepper <drepper@redhat.com>2007-02-10 00:10:39 +0000
commit5ed61e0fd6177e6ef6054a15ca04d0f5e90851d8 (patch)
treee7f2cffd58270538c3936f7fab4923201c38ce87
parent2bbb7d5b3c517956e95e5827037a76cbc39a20c8 (diff)
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Remove incorrect comment.cvs/fedora-glibc-20070211T1607
-rw-r--r--ChangeLog2
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sysdep.h1
4 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f1b6d3d022..07fe6a9b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-02-09 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Remove incorrect comment.
+
* resolv/res_init.c (res_setoptions): Recognize edns0 option.
* resolv/res_mkquery.c: Define __res_nopt.
* resolv/res_query.c (__libc_res_nquery): If RES_USE_EDNS0 is set
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5b01cb2ab6..1a47040a76 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-09 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+ (__lll_mutex_timedlock_wait): Use correct pointer when we don't
+ call into the kernel to delay.
+
2007-01-18 Ulrich Drepper <drepper@redhat.com>
* tst-initializers1.c: We want to test the initializers as seen
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 3783f1ccee..6724ded762 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -164,7 +164,7 @@ __lll_mutex_timedlock_wait:
8: /* NB: %edx == 2 */
xorl %eax, %eax
LOCK
- cmpxchgl %edx, (%rdi)
+ cmpxchgl %edx, (%r12)
jnz 7f
6: addq $16, %rsp
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index 3a0a632aab..1d9a68a046 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -182,7 +182,6 @@
The Linux kernel uses and destroys internally these registers:
return address from
syscall rcx
- additionally clobered: r12-r15,rbx,rbp
eflags from syscall r11
Normal function call, including calls to the system call stub