2012-06-06 Pedro Alves <palves@redhat.com>

	* infrun.c (handle_inferior_event) <deferred_step_ptid>: Use
	context_switch and remove stale comment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f144713..94dbba0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2012-06-06  Pedro Alves  <palves@redhat.com>
 
+       * infrun.c (handle_inferior_event) <deferred_step_ptid>: Use
+       context_switch and remove stale comment.
+
+2012-06-06  Pedro Alves  <palves@redhat.com>
+
        * infrun.c (struct execution_control_state): Remove
        `new_thread_event' field.
        (handle_inferior_event): Simplify new threads handling; don't

diff --git a/gdb/infrun.c b/gdb/infrun.c
index b008552..0017211 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3813,9 +3813,7 @@ handle_inferior_event (struct execution_control_state *ecs)
 
          ecs->event_thread->control.trap_expected = 0;
 
-         /* Note: We do not call context_switch at this point, as the
-            context is already set up for stepping the original thread.  */
-         switch_to_thread (deferred_step_ptid);
+         context_switch (deferred_step_ptid);
          deferred_step_ptid = null_ptid;
          /* Suppress spurious "Switching to ..." message.  */
          previous_inferior_ptid = inferior_ptid;