diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e6202de248a..b15a3a4e25f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-21  Simon Marchi  <simon.marchi@efficios.com>
+
+	* linux-nat.c (stopped_pids): Make static.
+
 2020-07-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	PR ada/26235
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 6a78735018c..20b03bc2ba9 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -204,7 +204,7 @@ struct simple_pid_list
   int status;
   struct simple_pid_list *next;
 };
-struct simple_pid_list *stopped_pids;
+static struct simple_pid_list *stopped_pids;
 
 /* Whether target_thread_events is in effect.  */
 static int report_thread_events;
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 9d615870d17..d924e7231f4 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-21  Simon Marchi  <simon.marchi@efficios.com>
+
+	* linux-low.cc (stopped_pids): Make static.
+
 2020-07-17  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* tdesc.cc (allocate_target_description): Add header comment.
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 9684922d1a1..e45493339d2 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -206,7 +206,7 @@ struct simple_pid_list
   /* Next in chain.  */
   struct simple_pid_list *next;
 };
-struct simple_pid_list *stopped_pids;
+static struct simple_pid_list *stopped_pids;
 
 /* Trivial list manipulation functions to keep track of a list of new
    stopped processes.  */