On Thu, Sep 01, 2022 at 07:17:37PM -0700, isaku.yamahata@xxxxxxxxx wrote:
> From: Isaku Yamahata <isaku.yamahata@xxxxxxxxx>
>
> convert per_cpu_ptr(smp_processor_id()) to this_cpu_ptr() as trivial
> cleanup.
Reviewed-by: Yuan Yao <yuan.yao@xxxxxxxxx>
>
> Signed-off-by: Isaku Yamahata <isaku.yamahata@xxxxxxxxx>
> Reviewed-by: Chao Gao <chao.gao@xxxxxxxxx>
> ---
> arch/x86/kvm/x86.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 0e200fe44b35..fd021581ca60 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -428,8 +428,7 @@ static void kvm_user_return_msr_init_cpu(struct kvm_user_return_msrs *msrs)
>
> int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask)
> {
> - unsigned int cpu = smp_processor_id();
> - struct kvm_user_return_msrs *msrs = per_cpu_ptr(user_return_msrs, cpu);
> + struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
> int err;
>
> kvm_user_return_msr_init_cpu(msrs);
> @@ -453,8 +452,7 @@ EXPORT_SYMBOL_GPL(kvm_set_user_return_msr);
>
> static void drop_user_return_notifiers(void)
> {
> - unsigned int cpu = smp_processor_id();
> - struct kvm_user_return_msrs *msrs = per_cpu_ptr(user_return_msrs, cpu);
> + struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
>
> if (msrs->registered)
> kvm_on_user_return(&msrs->urn);
> --
> 2.25.1
>
