aboutsummaryrefslogtreecommitdiffstats
path: root/xen/drivers/acpi
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-08-09 18:06:43 +0100
committerKeir Fraser <keir@xen.org>2011-08-09 18:06:43 +0100
commit5aeaa2f52f4b8380f3f9591538ce8b1a12b9d902 (patch)
tree550baf5b0998adb194638450c56c7fb7b5afe7ff /xen/drivers/acpi
parentb406d93c619be11ee6295cb35c15a2a6d7b4ab71 (diff)
downloadxen-5aeaa2f52f4b8380f3f9591538ce8b1a12b9d902.tar.gz
xen-5aeaa2f52f4b8380f3f9591538ce8b1a12b9d902.tar.bz2
xen-5aeaa2f52f4b8380f3f9591538ce8b1a12b9d902.zip
ACPI ERST: Revert change to erst_check_table() to be more permissive.
Permits tables that apparently Xen cannot handle (causes boot failure on many systems). Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/drivers/acpi')
-rw-r--r--xen/drivers/acpi/apei/erst.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/xen/drivers/acpi/apei/erst.c b/xen/drivers/acpi/apei/erst.c
index e012cd39e0..eb666a6fca 100644
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -715,13 +715,7 @@ int erst_clear(u64 record_id)
static int __init erst_check_table(struct acpi_table_erst *erst_tab)
{
- /*
- * Some old BIOSes include the ACPI standard header in the ERST header
- * length; new BIOSes do not. Our check allows for both methods.
- */
- if ((erst_tab->header_length !=
- (sizeof(struct acpi_table_erst) - sizeof(erst_tab->header)))
- && (erst_tab->header_length != sizeof(struct acpi_table_erst)))
+ if (erst_tab->header_length != sizeof(struct acpi_table_erst))
return -EINVAL;
if (erst_tab->header.length < sizeof(struct acpi_table_erst))
return -EINVAL;