diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-30 23:28:32 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-30 23:28:32 +0100 |
| commit | 2c3e9e2eeaa01c4cece290c18fb8d9a18cda36b3 (patch) | |
| tree | 7f21cdadd12647b16443b1d75ed68ffc94932ffd /xen/include/xen/trace.h | |
| parent | b55e426e37b4b6d7c6ed1a76e4d445bfc4e6b8ac (diff) | |
| download | xen-2c3e9e2eeaa01c4cece290c18fb8d9a18cda36b3.tar.gz xen-2c3e9e2eeaa01c4cece290c18fb8d9a18cda36b3.tar.bz2 xen-2c3e9e2eeaa01c4cece290c18fb8d9a18cda36b3.zip | |
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@xensource.com>
Diffstat (limited to 'xen/include/xen/trace.h')
| -rw-r--r-- | xen/include/xen/trace.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 8e5e282769..e09051c259 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -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 @@ void trace(u32 event, unsigned long d1, unsigned long d2, /* 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, \ |