linux/arch/powerpc
Paolo Bonzini 478d668625 KVM: PPC: drop duplicate tracepoint
Commit 29577fc00b ("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>
2014-08-05 14:23:41 +02:00
..
boot crypto: dts - Addition of missing SEC compatibile property in c29x device tree 2014-07-08 21:06:32 +08:00
configs KVM: PPC: Remove 440 support 2014-07-28 15:23:15 +02:00
crypto powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit 2013-03-05 16:56:26 +11:00
include Patch queue for ppc - 2014-08-01 2014-08-05 09:58:11 +02:00
kernel Patch queue for ppc - 2014-08-01 2014-08-05 09:58:11 +02:00
kvm KVM: PPC: drop duplicate tracepoint 2014-08-05 14:23:41 +02:00
lib powerpc: use _GLOBAL_TOC for memmove 2014-07-22 15:56:04 +10:00
math-emu powerpc: Correct emulated mtfsf instruction 2014-04-07 10:33:11 +10:00
mm powerpc: Clean up MMU_FTRS_A2 and MMU_FTR_TYPE_3E 2014-07-11 12:55:05 +10:00
net powerpc: bpf: Fix the broken LD_VLAN_TAG_PRESENT test 2014-06-27 16:14:12 -07:00
oprofile cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE} 2014-03-19 14:10:24 +01:00
perf powerpc/perf: Fix MMCR2 handling for EBB 2014-07-23 17:16:47 +10:00
platforms powerpc/powernv: Change BUG_ON to WARN_ON in elog code 2014-07-28 11:30:54 +10:00
sysdev powerpc/kmemleak: Do not scan the DART table 2014-06-24 14:29:46 +10:00
xmon powerpc/xmon: avoid format string leaking to printk 2014-06-11 17:04:03 +10:00
Kconfig locking/mutex: Disable optimistic spinning on some architectures 2014-07-16 14:57:07 +02:00
Kconfig.debug Patch queue for ppc - 2014-08-01 2014-08-05 09:58:11 +02:00
Makefile Merge branch 'merge' into next 2014-05-28 13:30:12 +10:00
relocs_check.pl Fix warning typo "CONFIG_RELCOATABLE" 2013-05-29 15:11:30 +02:00