diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 04dac06fd3c..0bf961053bf 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-24  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* inferiors.c (set_inferior_target_data): Remove.
+	* inferiors.h (set_inferior_target_data): Remove.
+
 2017-08-18  Yao Qi  <yao.qi@linaro.org>
 
 	* Makefile.in (OBS): Add selftest.o.
diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index 5a4a0d1c23b..8a2e5d2ab19 100644
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -314,12 +314,6 @@ inferior_target_data (struct thread_info *inferior)
   return inferior->target_data;
 }
 
-void
-set_inferior_target_data (struct thread_info *inferior, void *data)
-{
-  inferior->target_data = data;
-}
-
 struct regcache *
 inferior_regcache_data (struct thread_info *inferior)
 {
diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h
index 2290a63066e..be248b07774 100644
--- a/gdb/gdbserver/inferiors.h
+++ b/gdb/gdbserver/inferiors.h
@@ -161,7 +161,6 @@ struct inferior_list_entry *
 			   void *arg);
 
 void *inferior_target_data (struct thread_info *);
-void set_inferior_target_data (struct thread_info *, void *);
 struct regcache *inferior_regcache_data (struct thread_info *);
 void set_inferior_regcache_data (struct thread_info *, struct regcache *);