Merge tag 'x86-mm-2021-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[platform/kernel/linux-starfive.git] / arch / x86 / hyperv / mmu.c

diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c
index c0ba887..bd13736 100644 (file)
--- a/arch/x86/hyperv/mmu.c
+++ b/arch/x86/hyperv/mmu.c
@@ -52,8 +52,8 @@ static inline int fill_gva_list(u64 gva_list[], int offset,
        return gva_n - offset;
 }
 
-static void hyperv_flush_tlb_others(const struct cpumask *cpus,
-                                   const struct flush_tlb_info *info)
+static void hyperv_flush_tlb_multi(const struct cpumask *cpus,
+                                  const struct flush_tlb_info *info)
 {
        int cpu, vcpu, gva_n, max_gvas;
        struct hv_tlb_flush **flush_pcpu;
@@ -61,7 +61,7 @@ static void hyperv_flush_tlb_others(const struct cpumask *cpus,
        u64 status;
        unsigned long flags;
 
-       trace_hyperv_mmu_flush_tlb_others(cpus, info);
+       trace_hyperv_mmu_flush_tlb_multi(cpus, info);
 
        if (!hv_hypercall_pg)
                goto do_native;
@@ -164,7 +164,7 @@ check_status:
        if (hv_result_success(status))
                return;
 do_native:
-       native_flush_tlb_others(cpus, info);
+       native_flush_tlb_multi(cpus, info);
 }
 
 static u64 hyperv_flush_tlb_others_ex(const struct cpumask *cpus,
@@ -239,6 +239,6 @@ void hyperv_setup_mmu_ops(void)
                return;
 
        pr_info("Using hypercall for remote TLB flush\n");
-       pv_ops.mmu.flush_tlb_others = hyperv_flush_tlb_others;
+       pv_ops.mmu.flush_tlb_multi = hyperv_flush_tlb_multi;
        pv_ops.mmu.tlb_remove_table = tlb_remove_table;
 }