diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5275b31cb8..b8391d2476 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* target.h (struct target_ops) <to_set_trace_buffer_size>: Add
+	argument.
+	(target_set_trace_buffer_size): Add argument.
+	* target.c (update_current_target): Update.
+	* remote.c (remote_set_trace_buffer_size): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* target.h (struct target_ops) <to_set_circular_trace_buffer>: Add
diff --git a/gdb/remote.c b/gdb/remote.c
index 8e1c242e99..452e234b47 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11112,7 +11112,7 @@ remote_get_min_fast_tracepoint_insn_len (struct target_ops *self)
 }
 
 static void
-remote_set_trace_buffer_size (LONGEST val)
+remote_set_trace_buffer_size (struct target_ops *self, LONGEST val)
 {
   if (remote_protocol_packets[PACKET_QTBuffer_size].support
       != PACKET_DISABLE)
diff --git a/gdb/target.c b/gdb/target.c
index 9e6e749aac..9f3aa86498 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -911,7 +911,7 @@ update_current_target (void)
 	    (void (*) (struct target_ops *, int))
 	    target_ignore);
   de_fault (to_set_trace_buffer_size,
-	    (void (*) (LONGEST))
+	    (void (*) (struct target_ops *, LONGEST))
 	    target_ignore);
   de_fault (to_set_trace_notes,
 	    (int (*) (const char *, const char *, const char *))
diff --git a/gdb/target.h b/gdb/target.h
index 3c43d5ba5f..e62ee942f7 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -833,7 +833,7 @@ struct target_ops
     void (*to_set_disconnected_tracing) (struct target_ops *, int val);
     void (*to_set_circular_trace_buffer) (struct target_ops *, int val);
     /* Set the size of trace buffer in the target.  */
-    void (*to_set_trace_buffer_size) (LONGEST val);
+    void (*to_set_trace_buffer_size) (struct target_ops *, LONGEST val);
 
     /* Add/change textual notes about the trace run, returning 1 if
        successful, 0 otherwise.  */
@@ -1853,7 +1853,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_set_circular_trace_buffer) (&current_target, val)
 
 #define	target_set_trace_buffer_size(val)	\
-  (*current_target.to_set_trace_buffer_size) (val)
+  (*current_target.to_set_trace_buffer_size) (&current_target, val)
 
 #define	target_set_trace_notes(user,notes,stopnotes)		\
   (*current_target.to_set_trace_notes) ((user), (notes), (stopnotes))