Merge tag 'for-linus-4.15-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen fixes from Juergen Gross:
 "Two minor fixes for running as Xen dom0:

   - when built as 32 bit kernel on large machines the Xen LAPIC
     emulation should report a rather modern LAPIC in order to support
     enough APIC-Ids

   - The Xen LAPIC emulation is needed for dom0 only, so build it only
     for kernels supporting to run as Xen dom0"

* tag 'for-linus-4.15-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: XEN_ACPI_PROCESSOR is Dom0-only
  x86/Xen: don't report ancient LAPIC version

diff --combined arch/x86/xen/apic.c
index 6b830d4cb4c8e8e78c44dd87a12f642234533b4e,c14048553c185596b8420b0a965b62494b6c76ec..de58533d3664cdf067aedecfc81af2729c3b539b
--- 1/arch/x86/xen/apic.c
--- 2/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@@ -1,4 -1,3 +1,4 @@@
 +// SPDX-License-Identifier: GPL-2.0
  #include <linux/init.h>
  
  #include <asm/x86_init.h>
@@@ -31,7 -30,7 +31,7 @@@ static unsigned int xen_io_apic_read(un
        return 0xfd;
  }
  
 -static unsigned long xen_set_apic_id(unsigned int x)
 +static u32 xen_set_apic_id(unsigned int x)
  {
        WARN_ON(1);
        return x;
@@@ -57,7 -56,7 +57,7 @@@ static u32 xen_apic_read(u32 reg
                return 0;
  
        if (reg == APIC_LVR)
-               return 0x10;
+               return 0x14;
  #ifdef CONFIG_X86_32
        if (reg == APIC_LDR)
                return SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
@@@ -161,10 -160,12 +161,10 @@@ static struct apic xen_pv_apic = 
        /* .irq_delivery_mode - used in native_compose_msi_msg only */
        /* .irq_dest_mode     - used in native_compose_msi_msg only */
  
 -      .target_cpus                    = default_target_cpus,
        .disable_esr                    = 0,
        /* .dest_logical      -  default_send_IPI_ use it but we use our own. */
        .check_apicid_used              = default_check_apicid_used, /* Used on 32-bit */
  
 -      .vector_allocation_domain       = flat_vector_allocation_domain,
        .init_apic_ldr                  = xen_noop, /* setup_local_APIC calls it */
  
        .ioapic_phys_id_map             = default_ioapic_phys_id_map, /* Used on 32-bit */
@@@ -177,7 -178,7 +177,7 @@@
        .get_apic_id                    = xen_get_apic_id,
        .set_apic_id                    = xen_set_apic_id, /* Can be NULL on 32-bit. */
  
 -      .cpu_mask_to_apicid             = flat_cpu_mask_to_apicid,
 +      .calc_dest_apicid               = apic_flat_calc_apicid,
  
  #ifdef CONFIG_SMP
        .send_IPI_mask                  = xen_send_IPI_mask,