diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fa3167a1e..317df8060 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/stdio/fwalk.c (__fwalk, __fwalk_reent): Remove locking of
+	each fp.  Let the function being called lock the fp, if necessary.
+
 2009-01-07  Kazu Hirata  <kazu@codesourcery.com>
 
 	* libc/include/sys/stdio.h (_flockfile, _funlockfile): Fix typos.
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index 376959dcd..24cbe9ac4 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -40,10 +40,8 @@ _DEFUN(__fwalk, (ptr, function),
     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
       if (fp->_flags != 0)
         {
-          _flockfile (fp);
           if (fp->_flags != 0 && fp->_file != -1)
             ret |= (*function) (fp);
-          _funlockfile (fp);
         }
 
   return ret;
@@ -64,10 +62,8 @@ _DEFUN(__fwalk_reent, (ptr, reent_function),
     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
       if (fp->_flags != 0)
         {
-          _flockfile (fp);
           if (fp->_flags != 0 && fp->_file != -1)
             ret |= (*reent_function) (ptr, fp);
-          _funlockfile (fp);
         }
 
   return ret;