diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b8391d2476..c9cf31c629 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* target.h (struct target_ops) <to_set_trace_notes>: Add argument.
+	(target_set_trace_notes): Add argument.
+	* target.c (update_current_target): Update.
+	* remote.c (remote_set_trace_notes): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* target.h (struct target_ops) <to_set_trace_buffer_size>: Add
diff --git a/gdb/remote.c b/gdb/remote.c
index 452e234b47..1e33ed7e66 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11144,7 +11144,8 @@ remote_set_trace_buffer_size (struct target_ops *self, LONGEST val)
 }
 
 static int
-remote_set_trace_notes (const char *user, const char *notes,
+remote_set_trace_notes (struct target_ops *self,
+			const char *user, const char *notes,
 			const char *stop_notes)
 {
   struct remote_state *rs = get_remote_state ();
diff --git a/gdb/target.c b/gdb/target.c
index 9f3aa86498..d61d10091b 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -914,7 +914,8 @@ update_current_target (void)
 	    (void (*) (struct target_ops *, LONGEST))
 	    target_ignore);
   de_fault (to_set_trace_notes,
-	    (int (*) (const char *, const char *, const char *))
+	    (int (*) (struct target_ops *,
+		      const char *, const char *, const char *))
 	    return_zero);
   de_fault (to_get_tib_address,
 	    (int (*) (ptid_t, CORE_ADDR *))
diff --git a/gdb/target.h b/gdb/target.h
index e62ee942f7..1acd7196dd 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -837,7 +837,8 @@ struct target_ops
 
     /* Add/change textual notes about the trace run, returning 1 if
        successful, 0 otherwise.  */
-    int (*to_set_trace_notes) (const char *user, const char *notes,
+    int (*to_set_trace_notes) (struct target_ops *,
+			       const char *user, const char *notes,
 			       const char *stopnotes);
 
     /* Return the processor core that thread PTID was last seen on.
@@ -1856,7 +1857,8 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*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))
+  (*current_target.to_set_trace_notes) (&current_target,	\
+					(user), (notes), (stopnotes))
 
 #define target_get_tib_address(ptid, addr) \
   (*current_target.to_get_tib_address) ((ptid), (addr))