diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 1592a11c52..41567905a8 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-21  Yao Qi  <yao.qi@linaro.org>
+
+	* mem-break.c (find_gdb_breakpoint): Cast bp to
+	'struct gdb_breakpoint *' rather than 'gdb_breakpoint *'.
+
 2016-07-21  Yao Qi  <yao.qi@linaro.org>
 
 	* server.c (handle_v_requests): Support s and S actions
diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index 65ca3f9d3e..7cd037f89a 100644
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -996,7 +996,7 @@ find_gdb_breakpoint (char z_type, CORE_ADDR addr, int kind)
   for (bp = proc->breakpoints; bp != NULL; bp = bp->next)
     if (bp->type == type && bp->raw->pc == addr
 	&& (kind == -1 || bp->raw->kind == kind))
-      return (gdb_breakpoint *) bp;
+      return (struct gdb_breakpoint *) bp;
 
   return NULL;
 }