From: Paolo Bonzini <pbonzini@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Alexander Graf <agraf@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the kvm-ppc tree
Date: Tue, 05 Aug 2014 11:19:22 +0200 [thread overview]
Message-ID: <53E0A19A.4060504@redhat.com> (raw)
In-Reply-To: <20140804203618.67a5ba54@canb.auug.org.au>
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
next prev parent reply other threads:[~2014-08-05 9:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 10:36 linux-next: build failure after merge of the kvm-ppc tree Stephen Rothwell
2014-08-05 9:19 ` Paolo Bonzini [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-28 4:31 Stephen Rothwell
2017-04-07 6:37 Stephen Rothwell
2012-10-15 0:41 Stephen Rothwell
2012-07-05 5:49 Stephen Rothwell
2012-07-05 6:02 ` Alexander Graf
2012-07-05 14:20 ` Yoder Stuart-B08248
2012-05-16 7:24 Stephen Rothwell
2012-05-16 9:15 ` Paul Mackerras
2012-05-16 9:19 ` Alexander Graf
2012-05-01 3:55 Stephen Rothwell
2012-05-01 4:55 ` Benjamin Herrenschmidt
2012-05-01 8:37 ` Alexander Graf
2012-05-02 13:16 ` Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53E0A19A.4060504@redhat.com \
--to=pbonzini@redhat.com \
--cc=agraf@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).