diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a4d704837e..4c7b8445fc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* lin-lwp.c (child_wait): Check SAVE_ERRNO instead of ERRNO in
+	while statement.
+
 2002-03-29  Jim Blandy  <jimb@redhat.com>
 
 	* cli/cli-dump.c (_initialize_cli_dump): Older GCC's tolerate
diff --git a/gdb/lin-lwp.c b/gdb/lin-lwp.c
index 216198b003..cb5b19f314 100644
--- a/gdb/lin-lwp.c
+++ b/gdb/lin-lwp.c
@@ -969,7 +969,7 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
       clear_sigio_trap ();
       clear_sigint_trap ();
     }
-  while (pid == -1 && errno == EINTR);
+  while (pid == -1 && save_errno == EINTR);
 
   if (pid == -1)
     {