Re: fastpath_t? __no_kcsan? Both?

[Paolo Bonzini]

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