Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 478d6686 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: PPC: drop duplicate tracepoint 



Commit 29577fc0 ("KVM: PPC: HV: Remove generic instruction emulation")
caused a build failure with allyesconfig:

arch/powerpc/kvm/kvm-pr.o:(__tracepoints+0xa8): multiple definition of `__tracepoint_kvm_ppc_instr'
arch/powerpc/kvm/kvm.o:(__tracepoints+0x1c0): first defined here

due to a duplicate definition of the tracepoint in trace.h and
trace_pr.h.  Because the tracepoint is still used by Book3S HV
code, and because the PR code does include trace.h, just remove
the duplicate definition from trace_pr.h, and export it from
kvm.o.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cc568ead

arch/powerpc/kvm/powerpc.c

+2 −0
Original line number Diff line number Diff line
@@ -1347,3 +1347,5 @@ void kvm_arch_exit(void) 
{



}



EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_ppc_instr);

arch/powerpc/kvm/trace_pr.h

+0 −20
Original line number Diff line number Diff line
@@ -291,26 +291,6 @@ TRACE_EVENT(kvm_unmap_hva, 
	TP_printk("unmap hva 0x%lx\n", __entry->hva)

);



TRACE_EVENT(kvm_ppc_instr,

	TP_PROTO(unsigned int inst, unsigned long _pc, unsigned int emulate),

	TP_ARGS(inst, _pc, emulate),



	TP_STRUCT__entry(

		__field(	unsigned int,	inst		)

		__field(	unsigned long,	pc		)

		__field(	unsigned int,	emulate		)

	),



	TP_fast_assign(

		__entry->inst		= inst;

		__entry->pc		= _pc;

		__entry->emulate	= emulate;

	),



	TP_printk("inst %u pc 0x%lx emulate %u\n",

		  __entry->inst, __entry->pc, __entry->emulate)

);



#endif /* _TRACE_KVM_H */



/* This part must be outside protection */