summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-06-28 05:07:08 +0000
committerUlrich Drepper <drepper@redhat.com>2004-06-28 05:07:08 +0000
commit539842a4ea456e0caabc7dc00d46daa1a97c8c07 (patch)
treed6b06894c4bdfb2e8ebc2b6853e5c78d17b789fe /nptl
parent482bbeb905781e7b17e8d79b40d2a18c317ec4f1 (diff)
downloadglibc-539842a4ea456e0caabc7dc00d46daa1a97c8c07.tar.gz
glibc-539842a4ea456e0caabc7dc00d46daa1a97c8c07.tar.xz
glibc-539842a4ea456e0caabc7dc00d46daa1a97c8c07.zip
Update.
	* elf/ldconfig.c (add_dir): Take chroot into account.
	Based on changes by HJ Lu and Hideki Iwamoto.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b0488028d1..e1df427a28 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/s390/lowlevellock.h (lll_futex_requeue):
+	Set __r7 to val, not mutex.
+
 2004-06-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* Makefile: Add rules to build tst-rwlock14.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
index 34f8b09f61..f4ed98a503 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
@@ -91,7 +91,7 @@
     register unsigned long int __r4 asm ("4") = (long int) (nr_wake);	      \
     register unsigned long int __r5 asm ("5") = (long int) (nr_move);	      \
     register unsigned long int __r6 asm ("6") = (unsigned long int) (mutex);  \
-    register unsigned long int __r7 asm ("7") = (int) (mutex);		      \
+    register unsigned long int __r7 asm ("7") = (int) (val);		      \
     register unsigned long __result asm ("2");				      \
 									      \
     __asm __volatile ("svc %b1"						      \