diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index f138ec6a36c..de34786d247 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-25  Pedro Alves  <pedro@codesourcery.com>
+
+	* linux-low.c (linux_wait_1): Move non-debugging code out of
+	`debug_threads' control.
+
 2010-08-25  Pedro Alves  <pedro@codesourcery.com>
 
 	* linux-low.c (linux_wait_1): Don't set last_status here.
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index b92e987d691..881028554e3 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -2200,9 +2200,10 @@ Check if we're already there.\n",
 	      if (debug_threads)
 		fprintf (stderr, "dequeued one signal.\n");
 	    }
-	  else if (debug_threads)
+	  else
 	    {
-	      fprintf (stderr, "no deferred signals.\n");
+	      if (debug_threads)
+		fprintf (stderr, "no deferred signals.\n");
 
 	      if (stabilizing_threads)
 		{