aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-01 21:24:29 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-01 21:24:29 +0000
commit927f0673b3bce7c209071bb5c4e3815f9b1ef0b0 (patch)
tree1859ee41b1ef187590d86f1e8101daa353bbe0fb /nptl
parentcb984ef2a284a17e67b9143f4a432df719191004 (diff)
downloadglibc-927f0673b3bce7c209071bb5c4e3815f9b1ef0b0.zip
glibc-927f0673b3bce7c209071bb5c4e3815f9b1ef0b0.tar.gz
glibc-927f0673b3bce7c209071bb5c4e3815f9b1ef0b0.tar.bz2
* nscd/nscd_initgroups.c (__nscd_getgrouplist): Always add the group the caller provided unless there is a real problem.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S2
2 files changed, 4 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index cbedbc3..85df60f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2004-10-01 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+ (__lll_mutex_timedlock_wait): Address futex correctly.
+
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
(__lll_mutex_timedlock_wait): I woken but cannot get the lock,
make sure 2 is stored in the futex and we looked at the old value.
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 6827804..d5c9345 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -152,7 +152,7 @@ __lll_mutex_timedlock_wait:
/* Make sure the current holder knows we are going to sleep. */
movl %edx, %eax
- xchgl %eax, (%ebx)
+ xchgl %eax, (%rdi)
testl %eax, %eax
jz 6b
jmp 1b