linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>
Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] arm64/kvm: Fix duplicate tracepoint definitions after KVM consolidation
Date: Wed, 22 Apr 2020 16:50:54 +0100	[thread overview]
Message-ID: <f353b0115e16914b0f91d74246c277d1@kernel.org> (raw)
In-Reply-To: <20200422152249.GE676@willie-the-truck>

On 2020-04-22 16:22, Will Deacon wrote:
> On Tue, Apr 21, 2020 at 10:17:07AM +0100, Will Deacon wrote:
>> Both kvm/{arm,handle_exit}.c include trace.h and attempt to 
>> instantiate
>> the same tracepoints, resulting in failures at link-time:
>> 
>>   | aarch64-linux-gnu-ld: 
>> arch/arm64/kvm/handle_exit.o:(__tracepoints+0x30):
>>   |   multiple definition of `__tracepoint_kvm_wfx_arm64';
>>   |   arch/arm64/kvm/arm.o:(__tracepoints+0x510): first defined here
>>   | ...
>> 
>> Split trace.h into two files so that the tracepoints are only created
>> in the C files that use them.
>> 
>> Cc: Marc Zyngier <maz@kernel.org>
>> Signed-off-by: Will Deacon <will@kernel.org>
>> ---
>> 
>> Applies against kvm-arm64/welcome-home. Probably worth just folding in
>> to the only commit on that branch.
> 
> I also just noticed that you forgot to update MAINTAINERS after the 
> move,
> so you can fold in the diff below as well.

All applied, squashed and pushed out.

Thanks,

         M.
-- 
Jazz is not dead. It just smells funny...

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

      reply	other threads:[~2020-04-22 15:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21  9:17 [PATCH] arm64/kvm: Fix duplicate tracepoint definitions after KVM consolidation Will Deacon
2020-04-22 15:22 ` Will Deacon
2020-04-22 15:50   ` Marc Zyngier [this message]

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=f353b0115e16914b0f91d74246c277d1@kernel.org \
    --to=maz@kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=will@kernel.org \
    /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).