From: Bob Moore Date: Fri, 4 Jul 2008 02:56:13 +0000 (+0800) Subject: ACPICA: Fix wrong resource descriptor length for 64-bit build X-Git-Tag: firefly_0821_release~17134^2~26^2~32 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9db4fcd99f7ef886ded97cd26a8642c70fbe34df;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown --- 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)