Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / xen / xen-acpi-processor.c

diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 82358d14ecf18a020f200aa0dc8260d9a6d1807b..59fc190f1e927da2edc58a536557adac9ce73a8f 100644 (file)
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -127,7 +127,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
                        pr_debug("     C%d: %s %d uS\n",
                                 cx->type, cx->desc, (u32)cx->latency);
                }
-       } else if (ret != -EINVAL)
+       } else if ((ret != -EINVAL) && (ret != -ENOSYS))
                /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
                 * table is referencing a non-existing CPU - which can happen
                 * with broken ACPI tables. */
@@ -259,7 +259,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr)
                        (u32) perf->states[i].power,
                        (u32) perf->states[i].transition_latency);
                }
-       } else if (ret != -EINVAL)
+       } else if ((ret != -EINVAL) && (ret != -ENOSYS))
                /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
                 * table is referencing a non-existing CPU - which can happen
                 * with broken ACPI tables. */