diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 06:48:21 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 06:48:21 +0900 |
commit | 2870f5352451a99a364a807803e4c39477264c3c (patch) | |
tree | 11ee9795559bdc9645a0a17815611c624066c515 /drivers/xen/xen-acpi-processor.c | |
parent | 06c77b3ce1b81163d74d9d5e904de731934e8510 (diff) | |
parent | 5fdbdd1d4b9ec58e51092e24c231a303b38cdb94 (diff) | |
download | lwn-2870f5352451a99a364a807803e4c39477264c3c.tar.gz lwn-2870f5352451a99a364a807803e4c39477264c3c.zip |
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
Diffstat (limited to 'drivers/xen/xen-acpi-processor.c')
-rw-r--r-- | drivers/xen/xen-acpi-processor.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c index 174b5653cd8a..0b48579a9cd6 100644 --- a/drivers/xen/xen-acpi-processor.c +++ b/drivers/xen/xen-acpi-processor.c @@ -128,7 +128,10 @@ 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 + } else if (ret != -EINVAL) + /* EINVAL means the ACPI ID is incorrect - meaning the ACPI + * table is referencing a non-existing CPU - which can happen + * with broken ACPI tables. */ pr_err(DRV_NAME "(CX): Hypervisor error (%d) for ACPI CPU%u\n", ret, _pr->acpi_id); |