Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.316
diff -u -p -r1.316 infrun.c
--- infrun.c	8 Sep 2008 22:10:20 -0000	1.316
+++ infrun.c	9 Sep 2008 23:37:09 -0000
@@ -2472,7 +2472,8 @@ targets should add new threads to the th
       if (!HAVE_STEPPABLE_WATCHPOINT)
 	remove_breakpoints ();
       registers_changed ();
-      target_resume (ecs->ptid, 1, TARGET_SIGNAL_0);	/* Single step */
+      gdb_assert (ptid_equal (inferior_ptid, ecs->ptid));
+      resume (1, TARGET_SIGNAL_0);	/* Single step */
       waiton_ptid = ecs->ptid;
       if (HAVE_STEPPABLE_WATCHPOINT)
 	infwait_state = infwait_step_watch_state;