From 55164bb6c3c9a201ee0ea8854d10be7340d4f1f9 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 20 Jun 2011 17:52:13 -0700 Subject: [PATCH] --- yaml --- r: 257963 b: refs/heads/master c: bd9ddc875b6659f9f74dcfd285c472bc58041abd h: refs/heads/master i: 257961: 90a3ea3a5756a4e67dca873ba517284796b6d7f1 257959: ccdae8f89a1bf0ddbea8c9fa8ecfe603de15a87f v: v3 --- [refs] | 2 +- trunk/include/trace/events/xen.h | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index cd625ea21b5d..aaf92de7c316 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c43ed60cbf3bd7d4bd6603258429361cffa09547 +refs/heads/master: bd9ddc875b6659f9f74dcfd285c472bc58041abd diff --git a/trunk/include/trace/events/xen.h b/trunk/include/trace/events/xen.h index 147eb6ffc13c..44d8decee09e 100644 --- a/trunk/include/trace/events/xen.h +++ b/trunk/include/trace/events/xen.h @@ -9,8 +9,7 @@ #include /* Multicalls */ - -TRACE_EVENT(xen_mc_batch, +DECLARE_EVENT_CLASS(xen_mc__batch, TP_PROTO(enum paravirt_lazy_mode mode), TP_ARGS(mode), TP_STRUCT__entry( @@ -21,18 +20,13 @@ TRACE_EVENT(xen_mc_batch, (__entry->mode == PARAVIRT_LAZY_MMU) ? "MMU" : (__entry->mode == PARAVIRT_LAZY_CPU) ? "CPU" : "NONE") ); +#define DEFINE_XEN_MC_BATCH(name) \ + DEFINE_EVENT(xen_mc__batch, name, \ + TP_PROTO(enum paravirt_lazy_mode mode), \ + TP_ARGS(mode)) -TRACE_EVENT(xen_mc_issue, - TP_PROTO(enum paravirt_lazy_mode mode), - TP_ARGS(mode), - TP_STRUCT__entry( - __field(enum paravirt_lazy_mode, mode) - ), - TP_fast_assign(__entry->mode = mode), - TP_printk("issue mode LAZY_%s", - (__entry->mode == PARAVIRT_LAZY_MMU) ? "MMU" : - (__entry->mode == PARAVIRT_LAZY_CPU) ? "CPU" : "NONE") - ); +DEFINE_XEN_MC_BATCH(xen_mc_batch); +DEFINE_XEN_MC_BATCH(xen_mc_issue); TRACE_EVENT(xen_mc_entry, TP_PROTO(struct multicall_entry *mc, unsigned nargs),