diff --git a/ChangeLog b/ChangeLog
index 816a17d431..d06226f9a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-03  Marcus Brinkmann  <marcus@gnu.org>
+
+	* configure.in (sysnames): Append sysdeps/generic for each add-on.
+	* configure: Regenerated.
+
 2005-02-02  Alfred M. Szmidt  <ams@gnu.org>
 
 	* sysdeps/mach/hurd/tls.h: Include <stdbool.h>
diff --git a/configure b/configure
index e10f4b9836..1e9e50c491 100755
--- a/configure
+++ b/configure
@@ -2093,6 +2093,14 @@ for d in $add_ons_pfx ''; do
       done
     done
   done
+  if test -n "$d"; then
+    try="${d}sysdeps/generic"
+    test -n "$enable_debug_configure" &&
+    echo "$0 DEBUG: try $try" >&2
+    if test -d $srcdir/$try; then
+      sysnames="$sysnames $try"
+    fi
+  fi
 done
 IFS="$ac_save_ifs"
 
diff --git a/configure.in b/configure.in
index 4ad54cfefd..11f78b0ec3 100644
--- a/configure.in
+++ b/configure.in
@@ -593,6 +593,14 @@ for d in $add_ons_pfx ''; do
       done
     done
   done
+  if test -n "$d"; then
+    try="${d}sysdeps/generic"
+    test -n "$enable_debug_configure" &&
+    echo "$0 DEBUG: try $try" >&2
+    if test -d $srcdir/$try; then
+      sysnames="$sysnames $try"
+    fi
+  fi
 done
 IFS="$ac_save_ifs"
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e299ba9af5..5ba1a14cbb 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-03  Marcus Brinkmann  <marcus@gnu.org>
+
+	* sysdeps/generic/lowlevellock.h (__generic_mutex_unlock): Fix
+	order of arguments in invocation of atomic_add_zero.
+
 2005-01-26  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S (__new_sem_trywait):
@@ -96,7 +101,7 @@
 	* sysdeps/pthread/posix-timer.h (__timer_signal_thread_pclk,
 	__timer_signal_thread_tclk): Remove.
 	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Removed.
-	* sysdeps/unix/sysv/linux/ia64/bits/posix_>opt.h: Removed.
+	* sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: Removed.
 	* sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h: Removed.
 
 2004-12-07  Jakub Jelinek  <jakub@redhat.com>
diff --git a/nptl/sysdeps/generic/lowlevellock.h b/nptl/sysdeps/generic/lowlevellock.h
index 9cffca83e6..7f95daadad 100644
--- a/nptl/sysdeps/generic/lowlevellock.h
+++ b/nptl/sysdeps/generic/lowlevellock.h
@@ -76,7 +76,7 @@ __generic_mutex_unlock (int *mutex)
   /* Adding 0x80000000 to the counter results in 0 if and only if
      there are not other interested threads - we can return (this is
      the fastpath).  */
-  if (atomic_add_zero (0x80000000, mutex))
+  if (atomic_add_zero (mutex, 0x80000000))
     return;
 
   /* There are other threads waiting for this mutex, wake one of them