From 539842a4ea456e0caabc7dc00d46daa1a97c8c07 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 28 Jun 2004 05:07:08 +0000 Subject: Update. * elf/ldconfig.c (add_dir): Take chroot into account. Based on changes by HJ Lu and Hideki Iwamoto. --- nptl/ChangeLog | 5 +++++ nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'nptl') 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 + + * sysdeps/unix/sysv/linux/s390/lowlevellock.h (lll_futex_requeue): + Set __r7 to val, not mutex. + 2004-06-27 Ulrich Drepper * 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" \ -- cgit v1.2.3