From 7103cc3df0c5882a464f26533e23e600ed7baf93 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 26 Apr 2012 14:22:33 -0400
Subject: [PATCH] --- yaml --- r: 299767 b: refs/heads/master c:
 b930fe5e1f5646e071facda70b25b137ebeae5af h: refs/heads/master i:   299765:
 b826005013253587b8141ca15416f5a58cb15041   299763:
 dd7da88c647f813e2beb3a12e0a12d210e9788c6   299759:
 1a0ca53ac17405a4dac7cc4a407659473f8e1bec v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/xen/xen-acpi-processor.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f84730264cdb..b0d642335dc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf405ae612b0f7e2358db7ff594c0e94846137aa
+refs/heads/master: b930fe5e1f5646e071facda70b25b137ebeae5af
diff --git a/trunk/drivers/xen/xen-acpi-processor.c b/trunk/drivers/xen/xen-acpi-processor.c
index 174b5653cd8a..0b48579a9cd6 100644
--- a/trunk/drivers/xen/xen-acpi-processor.c
+++ b/trunk/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);