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

[linux-2.6-microblaze.git] / arch / x86 / xen / mmu_pv.c

diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c
index 1e28c88..ade789e 100644 (file)
--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@ -1247,8 +1247,8 @@ static void xen_flush_tlb_one_user(unsigned long addr)
        preempt_enable();
 }
 
-static void xen_flush_tlb_others(const struct cpumask *cpus,
-                                const struct flush_tlb_info *info)
+static void xen_flush_tlb_multi(const struct cpumask *cpus,
+                               const struct flush_tlb_info *info)
 {
        struct {
                struct mmuext_op op;
@@ -1258,7 +1258,7 @@ static void xen_flush_tlb_others(const struct cpumask *cpus,
        const size_t mc_entry_size = sizeof(args->op) +
                sizeof(args->mask[0]) * BITS_TO_LONGS(num_possible_cpus());
 
-       trace_xen_mmu_flush_tlb_others(cpus, info->mm, info->start, info->end);
+       trace_xen_mmu_flush_tlb_multi(cpus, info->mm, info->start, info->end);
 
        if (cpumask_empty(cpus))
                return;         /* nothing to do */
@@ -1267,9 +1267,8 @@ static void xen_flush_tlb_others(const struct cpumask *cpus,
        args = mcs.args;
        args->op.arg2.vcpumask = to_cpumask(args->mask);
 
-       /* Remove us, and any offline CPUS. */
+       /* Remove any offline CPUs */
        cpumask_and(to_cpumask(args->mask), cpus, cpu_online_mask);
-       cpumask_clear_cpu(smp_processor_id(), to_cpumask(args->mask));
 
        args->op.cmd = MMUEXT_TLB_FLUSH_MULTI;
        if (info->end != TLB_FLUSH_ALL &&
@@ -2086,7 +2085,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
        .flush_tlb_user = xen_flush_tlb,
        .flush_tlb_kernel = xen_flush_tlb,
        .flush_tlb_one_user = xen_flush_tlb_one_user,
-       .flush_tlb_others = xen_flush_tlb_others,
+       .flush_tlb_multi = xen_flush_tlb_multi,
        .tlb_remove_table = tlb_remove_table,
 
        .pgd_alloc = xen_pgd_alloc,