diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 05f9c2a3931..70e30dd6db4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-21  Pedro Alves  <pedro@codesourcery.com>
+
+	* mi/mi-interp.c (mi_on_resume): Account for whole process
+	resumes.
+
 2009-05-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* m2-exp.y (MAX_FUNC): Fix trailing UNOP_MAX.
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 3426a39c714..e601ecd5293 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -419,7 +419,7 @@ mi_on_resume (ptid_t ptid)
 {
   struct thread_info *tp = NULL;
 
-  if (ptid_equal (ptid, minus_one_ptid))
+  if (ptid_equal (ptid, minus_one_ptid) || ptid_is_pid (ptid))
     tp = inferior_thread ();
   else
     tp = find_thread_pid (ptid);