diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0430d26cce..d16053311c 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_can_download_tracepoint>: Add
+	argument.
+	(target_can_download_tracepoint): Add argument.
+	* target.c (update_current_target): Update.
+	* remote.c (remote_can_download_tracepoint): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* target.h (struct target_ops) <to_download_tracepoint>: Add
diff --git a/gdb/remote.c b/gdb/remote.c
index 7a8fa1b641..e91eea318b 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10574,7 +10574,7 @@ remote_download_tracepoint (struct target_ops *self, struct bp_location *loc)
 }
 
 static int
-remote_can_download_tracepoint (void)
+remote_can_download_tracepoint (struct target_ops *self)
 {
   struct remote_state *rs = get_remote_state ();
   struct trace_status *ts;
diff --git a/gdb/target.c b/gdb/target.c
index 2c7a9462e8..db0c866d1f 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -855,7 +855,7 @@ update_current_target (void)
 	    (void (*) (struct target_ops *, struct bp_location *))
 	    tcomplain);
   de_fault (to_can_download_tracepoint,
-	    (int (*) (void))
+	    (int (*) (struct target_ops *))
 	    return_zero);
   de_fault (to_download_trace_state_variable,
 	    (void (*) (struct trace_state_variable *))
diff --git a/gdb/target.h b/gdb/target.h
index b051fb7aa5..d71dc97be2 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -764,7 +764,7 @@ struct target_ops
 
     /* Is the target able to download tracepoint locations in current
        state?  */
-    int (*to_can_download_tracepoint) (void);
+    int (*to_can_download_tracepoint) (struct target_ops *);
 
     /* Send full details of a trace state variable to the target.  */
     void (*to_download_trace_state_variable) (struct trace_state_variable *tsv);
@@ -1788,7 +1788,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_download_tracepoint) (&current_target, t)
 
 #define target_can_download_tracepoint() \
-  (*current_target.to_can_download_tracepoint) ()
+  (*current_target.to_can_download_tracepoint) (&current_target)
 
 #define target_download_trace_state_variable(tsv) \
   (*current_target.to_download_trace_state_variable) (tsv)