Il 04/08/2014 12:36, Stephen Rothwell ha scritto:
> Hi Alexander,
>
> After merging the kvm-ppc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> 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
>
> Caused by commit 29577fc00ba4 ("KVM: PPC: HV: Remove generic
> instruction emulation"). I note that this commit has no Reviewed-by,
> Tested-by or Acked-by tags and only one Signed-off-by tag.
>
> I have reverted that commit for today.
Thanks for the heads up. I will apply this, and wait for tomorrow's
linux-next build before sending the result to Linus:
diff --git a/arch/powerpc/kvm/trace_pr.h b/arch/powerpc/kvm/trace_pr.h
index a674f090dfb8..e1357cd8dc1f 100644
--- a/arch/powerpc/kvm/trace_pr.h
+++ b/arch/powerpc/kvm/trace_pr.h
@@ -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 */
Paolo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
