Merge tag 'for-linus-4.19b-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fixes and cleanups from Juergen Gross:
 "Some cleanups, some minor fixes and a fix for a bug introduced in this
  merge window hitting 32-bit PV guests"

* tag 'for-linus-4.19b-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: enable early use of set_fixmap in 32-bit Xen PV guest
  xen: remove unused hypercall functions
  x86/xen: remove unused function xen_auto_xlated_memory_setup()
  xen/ACPI: don't upload Px/Cx data for disabled processors
  x86/Xen: further refine add_preferred_console() invocations
  xen/mcelog: eliminate redundant setting of interface version
  x86/Xen: mark xen_setup_gdt() __init

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/xen/mcelog.c b/drivers/xen/mcelog.c
index 262835ace35d..b8bf61abb65b 100644
--- a/drivers/xen/mcelog.c
+++ b/drivers/xen/mcelog.c
@@ -288,7 +288,6 @@ static int mc_queue_handle(uint32_t flags)
         int ret = 0;
 
         mc_op.cmd = XEN_MC_fetch;
-        mc_op.interface_version = XEN_MCA_INTERFACE_VERSION;
         set_xen_guest_handle(mc_op.u.mc_fetch.data, &g_mi);
         do {
                 mc_op.u.mc_fetch.flags = flags;
@@ -358,7 +357,6 @@ static int bind_virq_for_mce(void)
 
         /* Fetch physical CPU Numbers */
         mc_op.cmd = XEN_MC_physcpuinfo;
-        mc_op.interface_version = XEN_MCA_INTERFACE_VERSION;
         set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
         ret = HYPERVISOR_mca(&mc_op);
         if (ret) {
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index b29f4e40851f..fbb9137c7d02 100644
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -362,6 +362,12 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv)
         default:
                 return AE_OK;
         }
+        if (invalid_phys_cpuid(acpi_get_phys_id(handle,
+                                                acpi_type == ACPI_TYPE_DEVICE,
+                                                acpi_id))) {
+                pr_debug("CPU with ACPI ID %u is unavailable\n", acpi_id);
+                return AE_OK;
+        }
         /* There are more ACPI Processor objects than in x2APIC or MADT.
          * This can happen with incorrect ACPI SSDT declerations. */
         if (acpi_id >= nr_acpi_bits) {