summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-07-04 10:56:13 +0800
committerLen Brown <len.brown@intel.com>2008-10-22 23:14:35 -0400
commit9db4fcd99f7ef886ded97cd26a8642c70fbe34df (patch)
tree51f454934a9973f43ad01c3040469fa8d362639f /include/acpi
parente56f561736e340a4e923b0db65f65dabf5d94823 (diff)
downloadlinux-9db4fcd99f7ef886ded97cd26a8642c70fbe34df.tar.gz
linux-9db4fcd99f7ef886ded97cd26a8642c70fbe34df.tar.bz2
linux-9db4fcd99f7ef886ded97cd26a8642c70fbe34df.zip
ACPICA: Fix wrong resource descriptor length for 64-bit build
The "minimal" descriptors such as EndTag are calculated as 12 bytes long, but the actual length in the internal descriptor is 16 because of the round-up to 8 on 64-bit build. http://www.acpica.org/bugzilla/show_bug.cgi?id=728 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/actypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 4ea4f40bf894..73d6b1cb07f3 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -1225,8 +1225,8 @@ struct acpi_resource {
#pragma pack()
-#define ACPI_RS_SIZE_MIN 12
#define ACPI_RS_SIZE_NO_DATA 8 /* Id + Length fields */
+#define ACPI_RS_SIZE_MIN (u32) ACPI_ROUND_UP_TO_NATIVE_WORD (12)
#define ACPI_RS_SIZE(type) (u32) (ACPI_RS_SIZE_NO_DATA + sizeof (type))
#define ACPI_NEXT_RESOURCE(res) (struct acpi_resource *)((u8 *) res + res->length)