From: Len Brown <len.brown@intel.com>
Date: Sun, 23 Sep 2012 02:52:17 +0000 (-0400)
Subject: tools/power/acpi/acpidump: version 20071116
X-Git-Tag: v3.7-rc1~89^2^3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39a55ff2c34a11ab9bbc8ba6f4dfb5d366cb2532;p=thirdparty%2Fkernel%2Flinux.git

tools/power/acpi/acpidump: version 20071116

This is unchanged version 20071116, plus a small bit in
DEFINE_ALTERNATE_TYPES to enable building with latest kernel headers.

Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/tools/power/acpi/acpidump.c b/tools/power/acpi/acpidump.c
index 8e5e19451ce1d..a63dee960311d 100644
--- a/tools/power/acpi/acpidump.c
+++ b/tools/power/acpi/acpidump.c
@@ -540,8 +540,11 @@ int main(int argc, char **argv)
 	if (connect) {
 		lseek(fd, sizeof(struct acpi_rsdp_descriptor), SEEK_SET);
 	}
-	if (!acpi_dump_XSDT(fd, &rsdpx))
-		goto not_found;
+	if (rsdpx.revision > 1 && rsdpx.xsdt_physical_address) {
+		/* ACPIDUMP uses xsdt table */
+		if (!acpi_dump_XSDT(fd, &rsdpx))
+			goto not_found;
+	}
 	if (!acpi_dump_RSDT(fd, &rsdpx))
 		goto not_found;
 	if (connect) {