diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 393663caee..8b358a96bd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-09  Kevin Buettner  <kevinb@redhat.com>
+
+	* lin-lwp.c (lin_lwp_pid_to_str): Revert inadvertent format
+	string change in 2001-05-03 changes.
+	(lin_lwp_wait): Revert GET_LWP coercion introduced in 2001-05-03
+	changes.
+
 2001-05-09  Kevin Buettner  <kevinb@redhat.com>
 
 	* lin-lwp.c (lin_lwp_attach): Use PIDGET() to fetch the pid
diff --git a/gdb/lin-lwp.c b/gdb/lin-lwp.c
index df62901a99..055ace7085 100644
--- a/gdb/lin-lwp.c
+++ b/gdb/lin-lwp.c
@@ -685,7 +685,7 @@ lin_lwp_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
 	  if (debug_lin_lwp)
 	    fprintf_unfiltered (gdb_stdlog, 
 				"Using pending wait status for LWP %d.\n",
-				(int) GET_LWP (lp->ptid));
+				GET_LWP (lp->ptid));
 
 	  status = lp->status;
 	  lp->status = 0;
@@ -1032,7 +1032,7 @@ lin_lwp_pid_to_str (ptid_t ptid)
 
   if (is_lwp (ptid))
     {
-      snprintf (buf, sizeof (buf), "LWP %ld", GET_LWP (ptid));
+      snprintf (buf, sizeof (buf), "LWP %d", GET_LWP (ptid));
       return buf;
     }