diff --git a/ChangeLog b/ChangeLog
index 25d981d6e8..965d5a4fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/i686/hp-timing.h (HP_TIMING_PRINT): Change type of
+	__len to size_t to avoid warnings.
+
 2003-04-18  Jes Sorensen  <jes@wildopensource.com>
 
 	* libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Sync with Linux
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2d94b1489d..d7cd8faddb 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/unregister-atfork.c
+	(__unregister_atfork): Don't free memory not allocated dynamically.
+
+	* semaphore.h: Remove __THROW marker from cancellation points.
+	* nptl/sysdeps/pthread/pthread.h: Likewise.
+
 2003-04-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/pthread.h: Don't mark pthread_testcancel,
diff --git a/sysdeps/i386/i686/hp-timing.h b/sysdeps/i386/i686/hp-timing.h
index afb5c7123b..41000edb08 100644
--- a/sysdeps/i386/i686/hp-timing.h
+++ b/sysdeps/i386/i686/hp-timing.h
@@ -1,5 +1,5 @@
 /* High precision, low overhead timing functions.  i686 version.
-   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -149,7 +149,7 @@ typedef unsigned long long int hp_timing_t;
   do {									      \
     char __buf[20];							      \
     char *__cp = _itoa (Val, __buf + sizeof (__buf), 10, 0);		      \
-    int __len = (Len);							      \
+    size_t __len = (Len);						      \
     char *__dest = (Buf);						      \
     while (__len-- > 0 && __cp < __buf + sizeof (__buf))		      \
       *__dest++ = *__cp++;						      \