diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f0cc5011ad7..20b723ebbda 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-15  Hui Zhu  <teawater@gmail.com>
+
+	* remote.c (remote_get_trace_status): Add comments.
+
 2011-07-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Code cleanup - constify struct lval_funcs.
diff --git a/gdb/remote.c b/gdb/remote.c
index 05a3dc8f04e..cbc7daafb5c 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10042,6 +10042,7 @@ remote_trace_start (void)
 static int
 remote_get_trace_status (struct trace_status *ts)
 {
+  /* Initialize it just to avoid a GCC false warning.  */
   char *p = NULL;
   /* FIXME we need to get register block size some other way.  */
   extern int trace_regblock_size;