diff options
author | Bob Moore <robert.moore@intel.com> | 2008-07-04 10:56:13 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-06 14:00:43 -0800 |
commit | 870346e874245447a5097bc1513acb45478c0a7a (patch) | |
tree | c98dfd8913ff43b82b7ef9090321df3af596f428 /include/acpi | |
parent | c17b1f3e00077f32e6369f750c491c00e08e23f5 (diff) |
ACPICA: Fix wrong resource descriptor length for 64-bit build
commit 9db4fcd99f7ef886ded97cd26a8642c70fbe34df upstream.
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>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/actypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 4ea4f40bf89..73d6b1cb07f 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) |