diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 974c6faae9..1a04804b91 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/mq_notify.c: Shut up GCC warning.
+
 2004-04-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/mq_notify.c: New file.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/mq_notify.c b/linuxthreads/sysdeps/unix/sysv/linux/mq_notify.c
index e231e591d1..2714fadb9d 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/mq_notify.c
+++ b/linuxthreads/sysdeps/unix/sysv/linux/mq_notify.c
@@ -137,6 +137,7 @@ helper_thread (void *arg)
 	/* The only state we keep is the copy of the thread attributes.  */
 	free (data.attr);
     }
+  return NULL;
 }
 
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 53fba001db..d1f5229da9 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/mq_notify.c: Shut up GCC warning.
+
 2004-04-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/mq-notify.c: New file.
diff --git a/nptl/sysdeps/unix/sysv/linux/mq_notify.c b/nptl/sysdeps/unix/sysv/linux/mq_notify.c
index e231e591d1..2714fadb9d 100644
--- a/nptl/sysdeps/unix/sysv/linux/mq_notify.c
+++ b/nptl/sysdeps/unix/sysv/linux/mq_notify.c
@@ -137,6 +137,7 @@ helper_thread (void *arg)
 	/* The only state we keep is the copy of the thread attributes.  */
 	free (data.attr);
     }
+  return NULL;
 }
 
 
diff --git a/sysdeps/s390/ffs.c b/sysdeps/s390/ffs.c
index ed7fdc682e..dfd724e11b 100644
--- a/sysdeps/s390/ffs.c
+++ b/sysdeps/s390/ffs.c
@@ -1,6 +1,6 @@
 /* ffs -- find first set bit in a word, counted from least significant end.
    S/390 version.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
    This file is part of the GNU C Library.
 
@@ -19,6 +19,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <limits.h>
 #define ffsl __something_else
 #include <string.h>
 
@@ -57,7 +58,7 @@ __ffs (x)
 		"3:  tml  %%r1,0x0001\n"
 		"    jnz  4f\n"
 		"    ahi  %0,1\n"
-		"4:" 
+		"4:"
 		: "=&d" (r) : "d" (x) : "cc", "1" );
 	return r+1;
 }
@@ -67,4 +68,3 @@ weak_alias (__ffs, ffs)
 #undef ffsl
 weak_alias (__ffs, ffsl)
 #endif
-