[Xen-changelog] Simplify trace header some more, and ensure that

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 2947b0df5ffabd3a70af384a8c6d6339142c7af7
# Parent  d8a39152f982f97ba6c1267e58f81dad366ed05b
Simplify trace header some more, and ensure that
construction of arguments for tracing is outlined from
straightline code paths.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r d8a39152f982 -r 2947b0df5ffa xen/common/trace.c
--- a/xen/common/trace.c        Sun Oct 30 22:17:58 2005
+++ b/xen/common/trace.c        Sun Oct 30 22:28:32 2005
@@ -40,7 +40,7 @@
 
 /* a flag recording whether initialization has been done */
 /* or more properly, if the tbuf subsystem is enabled right now */
-int tb_init_done = 0;
+int tb_init_done;
 
 /* which CPUs tracing is enabled on */
 static unsigned long tb_cpu_mask = (~0UL);
diff -r d8a39152f982 -r 2947b0df5ffa xen/include/xen/trace.h
--- a/xen/include/xen/trace.h   Sun Oct 30 22:17:58 2005
+++ b/xen/include/xen/trace.h   Sun Oct 30 22:28:32 2005
@@ -23,12 +23,8 @@
 #ifndef __XEN_TRACE_H__
 #define __XEN_TRACE_H__
 
-#include <asm/page.h>
-#include <xen/types.h>
-#include <xen/sched.h>
+#include <xen/config.h>
 #include <asm/atomic.h>
-#include <asm/current.h>
-#include <asm/msr.h>
 #include <public/dom0_ops.h>
 #include <public/trace.h>
 
@@ -46,7 +42,7 @@
 /* Avoids troubling the caller with casting their arguments to a trace macro */
 #define trace_do_casts(e,d1,d2,d3,d4,d5) \
     do {                                 \
-        if ( tb_init_done )              \
+        if ( unlikely(tb_init_done) )    \
             trace(e,                     \
                  (unsigned long)d1,      \
                  (unsigned long)d2,      \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog