diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 473c0ac9dfe..fa4b5cfdbeb 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_enable_tracepoint>: Add
+	argument.
+	(target_enable_tracepoint): Add argument.
+	* target.c (update_current_target): Update.
+	* remote.c (remote_enable_tracepoint): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* target.h (struct target_ops) <to_download_trace_state_variable>:
diff --git a/gdb/remote.c b/gdb/remote.c
index 8586bbce948..0f8acf3e1d1 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10625,7 +10625,8 @@ remote_download_trace_state_variable (struct target_ops *self,
 }
 
 static void
-remote_enable_tracepoint (struct bp_location *location)
+remote_enable_tracepoint (struct target_ops *self,
+			  struct bp_location *location)
 {
   struct remote_state *rs = get_remote_state ();
   char addr_buf[40];
diff --git a/gdb/target.c b/gdb/target.c
index 594d620353b..cbd090ac7a1 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -861,7 +861,7 @@ update_current_target (void)
 	    (void (*) (struct target_ops *, struct trace_state_variable *))
 	    tcomplain);
   de_fault (to_enable_tracepoint,
-	    (void (*) (struct bp_location *))
+	    (void (*) (struct target_ops *, struct bp_location *))
 	    tcomplain);
   de_fault (to_disable_tracepoint,
 	    (void (*) (struct bp_location *))
diff --git a/gdb/target.h b/gdb/target.h
index 80c58ca484b..2b0ee146e40 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -771,7 +771,8 @@ struct target_ops
 					      struct trace_state_variable *tsv);
 
     /* Enable a tracepoint on the target.  */
-    void (*to_enable_tracepoint) (struct bp_location *location);
+    void (*to_enable_tracepoint) (struct target_ops *,
+				  struct bp_location *location);
 
     /* Disable a tracepoint on the target.  */
     void (*to_disable_tracepoint) (struct bp_location *location);
@@ -1795,7 +1796,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_download_trace_state_variable) (&current_target, tsv)
 
 #define target_enable_tracepoint(loc) \
-  (*current_target.to_enable_tracepoint) (loc)
+  (*current_target.to_enable_tracepoint) (&current_target, loc)
 
 #define target_disable_tracepoint(loc) \
   (*current_target.to_disable_tracepoint) (loc)