KVM: PPC: drop duplicate tracepoint
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Aug 2014 09:29:07 +0000 (11:29 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Aug 2014 12:23:41 +0000 (14:23 +0200)
commit478d66862559bade81cb653af52b9aa53bee2c8a
tree9dabc6c9c4c7596f997152192f6e4a0d4718dde1
parentcc568ead3ce8e0284e7e2cc77bd1dafb03ba4ca1
KVM: PPC: drop duplicate tracepoint

Commit 29577fc00ba4 ("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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/powerpc/kvm/powerpc.c
arch/powerpc/kvm/trace_pr.h