From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: linux-next: build failure after merge of the kvm-ppc tree Date: Tue, 05 Aug 2014 11:19:22 +0200 Message-ID: <53E0A19A.4060504@redhat.com> References: <20140804203618.67a5ba54@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f50.google.com ([74.125.82.50]:59166 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932792AbaHEJTd (ORCPT ); Tue, 5 Aug 2014 05:19:33 -0400 In-Reply-To: <20140804203618.67a5ba54@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Alexander Graf Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org 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