diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 07bff94a5ff..73d1b94498b 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-06  Yao Qi  <yao@codesourcery.com>
+
+	* tracepoint.c [IN_PROCESS_AGENT] (debug_threads): Macro
+	defined.
+	[IN_PROCESS_AGENT] (debug_agent): New global variable.
+
 2012-01-04  Yao Qi  <yao@codesourcery.com>
 
 	* tracepoint.c (cmd_qtdp): Print debug message
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 43c538cb955..3e6dac00bc5 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -71,9 +71,13 @@ trace_vdebug (const char *fmt, ...)
   va_end (ap);
 }
 
+#ifdef IN_PROCESS_AGENT
+#define debug_threads debug_agent
+#endif
+
 #define trace_debug_1(level, fmt, args...)	\
   do {						\
-    if (level <= debug_threads)			\
+    if (level <= debug_threads)		\
       trace_vdebug ((fmt), ##args);		\
   } while (0)
 
@@ -370,7 +374,7 @@ tracepoint_look_up_symbols (void)
    GDBserver side.  */
 
 #ifdef IN_PROCESS_AGENT
-int debug_threads = 0;
+int debug_agent = 0;
 
 int
 read_inferior_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)