From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 5 Aug 2014 09:29:07 +0000 (+0200)
Subject: KVM: PPC: drop duplicate tracepoint
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~130^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=478d66862559bade81cb653af52b9aa53bee2c8a;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed