diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f0d2109d847..199e5c69487 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* procfs.c (procfs_create_inferior): Change prototype to match
+	definition.
+
 2017-05-04  Joel Brobecker  <brobecker@adacore.com>
 
 	* version.in: Set GDB version number to 7.99.91.DATE-git.
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 5d940ddbae2..adb2e846326 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -122,8 +122,8 @@ static void procfs_pass_signals (struct target_ops *self,
 				 int, unsigned char *);
 static void procfs_kill_inferior (struct target_ops *ops);
 static void procfs_mourn_inferior (struct target_ops *ops);
-static void procfs_create_inferior (struct target_ops *, char *,
-				    char *, char **, int);
+static void procfs_create_inferior (struct target_ops *, const char *,
+				    const std::string &, char **, int);
 static ptid_t procfs_wait (struct target_ops *,
 			   ptid_t, struct target_waitstatus *, int);
 static enum target_xfer_status procfs_xfer_memory (gdb_byte *,