[PATCH] Check for X__DSDT in acpi_get_table_header_early()

[Alex Williamson <alex_williamson@hp.com>]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]


   I finally got tired of my rx2600 printing garbage at the end of
the list of ACPI tables so I decided to fix it.  Turns out the HP
rx2600 does not provide a DSDT in the FADT, so we were trying to
print a table at 0x0.  It does provide a X_DSDT.  This patch will
make acpi_get_table_header_early() prefer the X_DSDT over the DSDT
and adds more checking for null.  Looks like the same code is in
2.6 and 2.4, please apply for both.  Thanks,

	Alex
 
-- 
Alex Williamson                             HP Linux & Open Source Lab

[-- Attachment #2: xdsdt.diff --]
[-- Type: text/plain, Size: 886 bytes --]

--- linux/drivers/acpi/tables.c	2003-07-27 11:00:40.000000000 -0600
+++ linux/drivers/acpi/tables.c	2003-08-07 14:15:11.000000000 -0600
@@ -256,10 +256,17 @@
 
 	/* Map the DSDT header via the pointer in the FADT */
 	if (id == ACPI_DSDT) {
-		struct acpi_table_fadt *fadt = (struct acpi_table_fadt *) *header;
+		struct fadt_descriptor_rev2 *fadt = (struct fadt_descriptor_rev2 *) *header;
+
+		if (fadt->header.revision == 3 && fadt->Xdsdt) {
+			*header = (void *) __acpi_map_table(fadt->Xdsdt,
+					sizeof(struct acpi_table_header));
+		} else if (fadt->V1_dsdt) {
+			*header = (void *) __acpi_map_table(fadt->V1_dsdt,
+					sizeof(struct acpi_table_header));
+		} else
+			*header = 0;
 
-		*header = (void *) __acpi_map_table(fadt->dsdt_addr,
-				sizeof(struct acpi_table_header));
 		if (!*header) {
 			printk(KERN_WARNING PREFIX "Unable to map DSDT\n");
 			return -ENODEV;