On 27.09.2013, at 12:03, Aneesh Kumar K.V wrote: > From: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > > This patch moves PR related tracepoints to a separate header. This > enables in converting PR to a kernel module which will be done in > later patches > > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > --- > arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- > arch/powerpc/kvm/book3s_mmu_hpte.c | 2 +- > arch/powerpc/kvm/book3s_pr.c | 3 +- > arch/powerpc/kvm/trace.h | 234 +-------------------------- > arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++++++++++++++++++++++ > 5 files changed, 308 insertions(+), 230 deletions(-) > create mode 100644 arch/powerpc/kvm/trace_pr.h > > diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c > index 329a978..fd5b393 100644 > --- a/arch/powerpc/kvm/book3s_64_mmu_host.c > +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c > @@ -27,7 +27,7 @@ > #include <asm/machdep.h> > #include <asm/mmu_context.h> > #include <asm/hw_irq.h> > -#include "trace.h" > +#include "trace_pr.h" > > #define PTE_SIZE 12 > > diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c > index d2d280b..4556168 100644 > --- a/arch/powerpc/kvm/book3s_mmu_hpte.c > +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c > @@ -28,7 +28,7 @@ > #include <asm/mmu_context.h> > #include <asm/hw_irq.h> > > -#include "trace.h" > +#include "trace_pr.h" > > #define PTE_SIZE 12 > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index 2a97279..99d0839 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -41,7 +41,8 @@ > #include <linux/vmalloc.h> > #include <linux/highmem.h> > > -#include "trace.h" > +#define CREATE_TRACE_POINTS > +#include "trace_pr.h" > > /* #define EXIT_DEBUG */ > /* #define DEBUG_EXT */ > diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h > index a088e9a..7d5a136 100644 > --- a/arch/powerpc/kvm/trace.h > +++ b/arch/powerpc/kvm/trace.h > @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, > {41, "HV_PRIV"} > #endif > > +#ifndef CONFIG_KVM_BOOK3S_PR > +/* > + * For pr we define this in trace_pr.h since it pr can be built as > + * a module Not sure I understand the need. If the config option is available, so should the struct field. Worst case that happens with HV is that we get empty shadow_srr1 values in our trace, no? If your goal is to make it more obvious whether we are tracing in PR or HV land (which is a reasonable goal), then you should also split off all non-common trace points into a special hv trace header so that it's obvious whether we are looking at HV or PR. Alex -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html