Merge tag 'v4.16-rc3' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -1316,12 +1316,12 @@ static void xen_flush_tlb(void)
|
||||
preempt_enable();
|
||||
}
|
||||
|
||||
static void xen_flush_tlb_single(unsigned long addr)
|
||||
static void xen_flush_tlb_one_user(unsigned long addr)
|
||||
{
|
||||
struct mmuext_op *op;
|
||||
struct multicall_space mcs;
|
||||
|
||||
trace_xen_mmu_flush_tlb_single(addr);
|
||||
trace_xen_mmu_flush_tlb_one_user(addr);
|
||||
|
||||
preempt_disable();
|
||||
|
||||
@@ -2386,7 +2386,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_single = xen_flush_tlb_single,
|
||||
.flush_tlb_one_user = xen_flush_tlb_one_user,
|
||||
.flush_tlb_others = xen_flush_tlb_others,
|
||||
|
||||
.pgd_alloc = xen_pgd_alloc,
|
||||
|
Reference in New Issue
Block a user