diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 838c685a82..5353e34d5a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (resume) <step past permanent breakpoint>: Use
+	do_target_resume.
+
 2015-04-01  Pedro Alves  <palves@redhat.com>
 
 	* linux-nat.c (linux_handle_extended_wait): Always call set_running.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4114246c0d..d7c250ea45 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2184,17 +2184,12 @@ resume (enum gdb_signal sig)
 		 thread advanced also" branch to be taken.  IOW, we
 		 don't want this thread to step further from PC
 		 (overstep).  */
+	      gdb_assert (!step_over_info_valid_p ());
 	      insert_single_step_breakpoint (gdbarch, aspace, pc);
 	      insert_breakpoints ();
 
-	      tp->suspend.stop_signal = GDB_SIGNAL_0;
-	      /* We're continuing with all breakpoints inserted.  It's
-		 safe to let the target bypass signals.  */
-	      target_pass_signals ((int) GDB_SIGNAL_LAST, signal_pass);
-	      /* ... and safe to let other threads run, according to
-		 schedlock.  */
 	      resume_ptid = user_visible_resume_ptid (user_step);
-	      target_resume (resume_ptid, 0, GDB_SIGNAL_0);
+	      do_target_resume (resume_ptid, 0, GDB_SIGNAL_0);
 	      discard_cleanups (old_cleanups);
 	      return;
 	    }