Merge tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel...

Pull xen fixes from Juergen Gross:
 "A fix for a missing __init annotation and two cleanup patches"

* tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen, arm64: drop dummy lookup_address()
  xen: don't compile pv-specific parts if XEN_PV isn't configured
  xen: x86: mark xen_find_pt_base as __init

diff --combined arch/x86/xen/mmu_pv.c
index 509f560bd0c6d4731cac96fc64296184e6818b9c,ddfeebc2b1257658511f902b518ea5d8acb2e78d..7330cb3b22833596cb46b17d43e6f6f22d543487
--- 1/arch/x86/xen/mmu_pv.c
--- 2/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@@ -985,12 -985,14 +985,12 @@@ static void xen_drop_mm_ref(struct mm_s
        /* Get the "official" set of cpus referring to our pagetable. */
        if (!alloc_cpumask_var(&mask, GFP_ATOMIC)) {
                for_each_online_cpu(cpu) {
 -                      if (!cpumask_test_cpu(cpu, mm_cpumask(mm))
 -                          && per_cpu(xen_current_cr3, cpu) != __pa(mm->pgd))
 +                      if (per_cpu(xen_current_cr3, cpu) != __pa(mm->pgd))
                                continue;
                        smp_call_function_single(cpu, drop_mm_ref_this_cpu, mm, 1);
                }
                return;
        }
 -      cpumask_copy(mask, mm_cpumask(mm));
  
        /*
         * It's possible that a vcpu may have a stale reference to our
@@@ -999,7 -1001,6 +999,7 @@@
         * look at its actual current cr3 value, and force it to flush
         * if needed.
         */
 +      cpumask_clear(mask);
        for_each_online_cpu(cpu) {
                if (per_cpu(xen_current_cr3, cpu) == __pa(mm->pgd))
                        cpumask_set_cpu(cpu, mask);
@@@ -2220,7 -2221,7 +2220,7 @@@ static void __init xen_write_cr3_init(u
   * not the first page table in the page table pool.
   * Iterate through the initial page tables to find the real page table base.
   */
- static phys_addr_t xen_find_pt_base(pmd_t *pmd)
+ static phys_addr_t __init xen_find_pt_base(pmd_t *pmd)
  {
        phys_addr_t pt_base, paddr;
        unsigned pmdidx;
@@@ -2409,6 -2410,8 +2409,6 @@@ static const struct pv_mmu_ops xen_mmu_
        .flush_tlb_single = xen_flush_tlb_single,
        .flush_tlb_others = xen_flush_tlb_others,
  
 -      .pte_update = paravirt_nop,
 -
        .pgd_alloc = xen_pgd_alloc,
        .pgd_free = xen_pgd_free,