diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a7ffbf87f3..323d582595 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-25  Yao Qi  <yao.qi@linaro.org>
+
+	* linux-low.c (reinsert_raw_breakpoint): If bp->inserted is true
+	return instead of error.
+
 2016-04-22  Yao Qi  <yao.qi@linaro.org>
 
 	* linux-aarch32-low.c (arm_store_gregset): Clear CPSR bits 20
diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index 419db9eb63..363d7ca562 100644
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -1515,7 +1515,7 @@ reinsert_raw_breakpoint (struct raw_breakpoint *bp)
   int err;
 
   if (bp->inserted)
-    error ("Breakpoint already inserted at reinsert time.");
+    return;
 
   err = the_target->insert_point (bp->raw_type, bp->pc, bp->kind, bp);
   if (err == 0)