diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index bef1d572084..0868f0bbd8a 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-21  Yao Qi  <yao.qi@linaro.org>
+
+	* tracepoint.c (max_jump_pad_size): Remove.
+
 2015-09-18  Yao Qi  <yao.qi@linaro.org>
 
 	* linux-aarch64-low.c: Don't include sys/uio.h.
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 5e34ebaf8e8..6b50f266f39 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -2916,9 +2916,6 @@ in_readonly_region (CORE_ADDR addr, ULONGEST length)
   return 0;
 }
 
-/* The maximum size of a jump pad entry.  */
-static const int max_jump_pad_size = 0x100;
-
 static CORE_ADDR gdb_jump_pad_head;
 
 /* Return the address of the next free jump space.  */