diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index eab7e8dff7..60244ef224 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-09  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (linux_read_loadmap): Pass current_inferior directly
+	to lwpid_of.
+
 2014-02-27  Pedro Alves  <palves@redhat.com>
 
 	PR 12702
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 2d8d5f5504..c847c62f72 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -5272,7 +5272,7 @@ static int
 linux_read_loadmap (const char *annex, CORE_ADDR offset,
 		    unsigned char *myaddr, unsigned int len)
 {
-  int pid = lwpid_of (get_thread_lwp (current_inferior));
+  int pid = lwpid_of (current_inferior);
   int addr = -1;
   struct target_loadmap *data = NULL;
   unsigned int actual_length, copy_length;