--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-07  Hui Zhu  <teawater@gmail.com>
+
+	* infrun.c (use_displaced_stepping): Displaced stepping just
+	enable in non-stop mode.
+
 2008-10-06  Doug Evans  <dje@google.com>
 
 	* dwarf2read.c (dwarf2_die_debug): New static global.
--- a/infrun.c
+++ b/infrun.c
@@ -568,11 +568,12 @@ Debugger's willingness to use displaced 
 }
 
 /* Return non-zero if displaced stepping is enabled, and can be used
-   with GDBARCH.  */
+   with GDBARCH, and in non-stop mode.  */
 static int
 use_displaced_stepping (struct gdbarch *gdbarch)
 {
   return (can_use_displaced_stepping
+	  && non_stop
 	  && gdbarch_displaced_step_copy_insn_p (gdbarch));
 }