summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-03-03 09:55:50 -0500
committerLen Brown <lenb@dhcppc3.>2005-03-03 09:55:50 -0500
commit1bd4f4d03d6c5cef0e451cf304f87cd3573e170b (patch)
treeb8c5ede41e12c050d32d78d47b087aa7febf5fb8
parent3cc24cb10c0fca1b697f9c17136f02d9422376aa (diff)
[ACPI] ACPICA 20050303 from Bob Moore for AE_AML_BUFFER_LIMIT issue.
It turns out that tightening up the interpreter to truncate buffers per the ACPI spec was a bad idea -- BIOS' in the field depended on old behaviour. Instead, we'll endeavor to update the ACPI spec to reflect industry practice in this area. http://bugme.osdl.org/show_bug.cgi?id=4263 Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/executer/exstorob.c2
-rw-r--r--include/acpi/acconfig.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 4e2b442ee5a3..b8b83331e345 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -105,6 +105,7 @@ acpi_ex_store_buffer_to_buffer (
ACPI_MEMSET (target_desc->buffer.pointer, 0, target_desc->buffer.length);
ACPI_MEMCPY (target_desc->buffer.pointer, buffer, length);
+#if ACPI_STRICT_CONFORMANCE
/*
* If the original source was a string, we must truncate the buffer,
* according to the ACPI spec. Integer-to-Buffer and Buffer-to-Buffer
@@ -115,6 +116,7 @@ acpi_ex_store_buffer_to_buffer (
target_desc->buffer.length = length;
}
+#endif
}
else {
/* Truncate the source, copy only what will fit */
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index d49803ea4898..9a98d99a7932 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -64,7 +64,7 @@
/* Version string */
-#define ACPI_CA_VERSION 0x20050228
+#define ACPI_CA_VERSION 0x20050303
/*
* OS name, used for the _OS object. The _OS object is essentially obsolete,