diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9184afc41c..74f91d207a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-12  Yao Qi  <yao.qi@linaro.org>
+
+	* nat/linux-ptrace.c (linux_child_function): Cast child_stack
+	to gdb_byte * and pass to linux_fork_to_function.
+
 2016-01-12  Yao Qi  <yao.qi@linaro.org>
 
 	* nat/linux-ptrace.c (linux_fork_to_function): Change type
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 31757ee71d..0eaf9a30ff 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -320,7 +320,7 @@ linux_child_function (void *child_stack)
   kill (getpid (), SIGSTOP);
 
   /* Fork a grandchild.  */
-  linux_fork_to_function (child_stack, linux_grandchild_function);
+  linux_fork_to_function ((gdb_byte *) child_stack, linux_grandchild_function);
 
   /* This code is only reacheable by the child (grandchild's parent)
      process.  */