diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 07560293938..f4c45439196 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.h (struct lwp_info) <thread_known>: Move under
+	the USE_THREAD_DB #ifdef.
+
 2013-04-16  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (INTERNAL_CFLAGS): Add @USE_THREAD_DB@.
diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
index 834dd9133c9..205d8039fa0 100644
--- a/gdb/gdbserver/linux-low.h
+++ b/gdb/gdbserver/linux-low.h
@@ -267,8 +267,8 @@ struct lwp_info
      stepping over later when it is resumed.  */
   int need_step_over;
 
-  int thread_known;
 #ifdef USE_THREAD_DB
+  int thread_known;
   /* The thread handle, used for e.g. TLS access.  Only valid if
      THREAD_KNOWN is set.  */
   td_thrhandle_t th;