From: Paolo Bonzini <pbonzini@redhat.com>
To: paulmck@kernel.org, cai@lca.pw, elver@google.com
Cc: linux-kernel@vger.kernel.org
Subject: Re: fastpath_t? __no_kcsan? Both?
Date: Mon, 15 Jun 2020 09:12:56 +0200 [thread overview]
Message-ID: <0bdd3592-24ae-ab35-a6cd-40d842b127e0@redhat.com> (raw)
In-Reply-To: <20200615042002.GA14788@paulmck-ThinkPad-P72>
On 15/06/20 06:20, Paul E. McKenney wrote:
>
> I get the following conflict when rebasing 39a8c47635b0 ("kvm/svm:
> Disable KCSAN for svm_vcpu_run()") onto v5.8-rc1:
>
> <<<<<<< 6c410247efb2d3907b508a2448ab9ab1c86d938c
> static fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
> =======
> static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
>>>>>>>> kvm/svm: Disable KCSAN for svm_vcpu_run()
> The "natural" resolution would be this:
>
> static fastpath_t __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
>
> But does that make sense?
fastpath_t is just an enum, so
static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
Now that KCSAN has been merged however I can do this change myself.
Thanks!
Paolo
next prev parent reply other threads:[~2020-06-15 7:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 4:20 fastpath_t? __no_kcsan? Both? Paul E. McKenney
2020-06-15 7:12 ` Paolo Bonzini [this message]
2020-06-15 14:03 ` Paul E. McKenney
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=0bdd3592-24ae-ab35-a6cd-40d842b127e0@redhat.com \
--to=pbonzini@redhat.com \
--cc=cai@lca.pw \
--cc=elver@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@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