diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index c7ceba3839..a5db572922 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-15  Yao Qi  <yao@codesourcery.com>
+
+	* tracepoint.c: Include sys/syscall.h.
+	(gdb_ust_thread): Remove preprocessor conditional.
+
 2011-12-14  Pedro Alves  <pedro@codesourcery.com>
 
 	* linux-low.c (linux_detach_one_lwp): Call
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 5f7177f2d0..fa4c317ccc 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -8029,6 +8029,8 @@ cmd_qtstmat (char *packet)
   return -1;
 }
 
+#include <sys/syscall.h>
+
 static void *
 gdb_ust_thread (void *arg)
 {
@@ -8038,10 +8040,8 @@ gdb_ust_thread (void *arg)
     {
       listen_fd = gdb_ust_socket_init ();
 
-#ifdef SYS_gettid
       if (helper_thread_id == 0)
 	helper_thread_id = syscall (SYS_gettid);
-#endif
 
       if (listen_fd == -1)
 	{