diff --git a/gdb/ChangeLog.arm b/gdb/ChangeLog.arm
index da444fdfd46..e3b32556ee7 100644
--- a/gdb/ChangeLog.arm
+++ b/gdb/ChangeLog.arm
@@ -1,3 +1,8 @@
+2016-03-29  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+    Backport from mainline
+    2015-07-17  Yao Qi  <yao.qi@linaro.org>
+    * remote.c (get_current_thread): Initialise ptid to null_ptid.
+    (add_current_inferior_and_thread): Don't initialise ptid.
 2016-02-16  Andre Vieira  <andre.simoesdiasvieira@arm.com>
     Backport from mainline
     2016-02-04  Yao Qi  <yao.qi@linaro.org>
diff --git a/gdb/remote.c b/gdb/remote.c
index 2ce29323267..bc6bacf040a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3507,7 +3507,7 @@ stop_reply_extract_thread (char *stop_reply)
 static ptid_t
 get_current_thread (char *wait_status)
 {
-  ptid_t ptid;
+  ptid_t ptid = null_ptid;
 
   /* Note we don't use remote_parse_stop_reply as that makes use of
      the target architecture, which we haven't yet fully determined at
@@ -3536,7 +3536,7 @@ add_current_inferior_and_thread (char *wait_status)
 {
   struct remote_state *rs = get_remote_state ();
   int fake_pid_p = 0;
-  ptid_t ptid = null_ptid;
+  ptid_t ptid;
 
   inferior_ptid = null_ptid;