diff -uNrBp a-2.6.7/arch/i386/kernel/acpi/boot.c b-2.6/arch/i386/kernel/acpi/boot.c
--- a-2.6.7/arch/i386/kernel/acpi/boot.c	2004-09-13 17:54:56.000000000 +0800
+++ b-2.6/arch/i386/kernel/acpi/boot.c	2004-09-16 15:22:14.275363568 +0800
@@ -478,6 +478,9 @@ acpi_scan_rsdp (
 {
 	unsigned long		offset = 0;
 	unsigned long		sig_len = sizeof("RSD PTR ") - 1;
+	unsigned long 		rsdp;
+	int 			ret;
+	void			*p;
 
 	/*
 	 * Scan all 16-byte boundaries of the physical memory region for the
@@ -486,6 +489,21 @@ acpi_scan_rsdp (
 	for (offset = 0; offset < length; offset += 16) {
 		if (strncmp((char *) (start + offset), "RSD PTR ", sig_len))
 			continue;
+		p = (void*)(start + offset);
+		rsdp = *((u32*)(p + 16));
+		if (rsdp == 0 || rsdp > (1UL<<16)) {
+			printk(KERN_WARNING "Wrong RSDP!! 0x%lx\n",rsdp);
+			continue;
+		}	
+		if ((*((u8*)(p+15))) == 2) {
+			ret = acpi_table_compute_checksum(p, (*((u32*)(p+20))));
+		} else {
+			ret = acpi_table_compute_checksum(p, 20);
+		}
+		if (ret) {
+			printk(KERN_WARNING "RSDP Checksum Error! \n");
+			continue;
+		}
 		return (start + offset);
 	}
 
diff -uNrBp a-2.6.7/drivers/acpi/tables.c b-2.6/drivers/acpi/tables.c
--- a-2.6.7/drivers/acpi/tables.c	2004-06-25 09:58:41.000000000 +0800
+++ b-2.6/drivers/acpi/tables.c	2004-09-16 15:18:49.367514296 +0800
@@ -218,7 +218,7 @@ acpi_table_print_madt_entry (
 }
 
 
-static int
+int
 acpi_table_compute_checksum (
 	void			*table_pointer,
 	unsigned long		length)
@@ -571,10 +571,9 @@ acpi_table_init (void)
 {
 	struct acpi_table_rsdp	*rsdp = NULL;
 	unsigned long		rsdp_phys = 0;
-	int			result = 0;
 
 	/* Locate and map the Root System Description Table (RSDP) */
-
+	/* Search until first one that is sane*/
 	rsdp_phys = acpi_find_rsdp();
 	if (!rsdp_phys) {
 		printk(KERN_ERR PREFIX "Unable to locate RSDP\n");
@@ -590,16 +589,6 @@ acpi_table_init (void)
 	printk(KERN_INFO PREFIX "RSDP (v%3.3d %6.6s                                    ) @ 0x%p\n",
 		rsdp->revision, rsdp->oem_id, (void *) rsdp_phys);
 
-	if (rsdp->revision < 2)
-		result = acpi_table_compute_checksum(rsdp, sizeof(struct acpi_table_rsdp));
-	else
-		result = acpi_table_compute_checksum(rsdp, ((struct acpi20_table_rsdp *)rsdp)->length);
-
-	if (result) {
-		printk(KERN_WARNING "  >>> ERROR: Invalid checksum\n");
-		return -ENODEV;
-	}
-
 	/* Locate and map the System Description table (RSDT/XSDT) */
 
 	if (acpi_table_get_sdt(rsdp))
diff -uNrBp a-2.6.7/include/linux/acpi.h b-2.6/include/linux/acpi.h
--- a-2.6.7/include/linux/acpi.h	2004-06-25 09:57:51.000000000 +0800
+++ b-2.6/include/linux/acpi.h	2004-09-16 14:58:45.704498888 +0800
@@ -389,6 +389,7 @@ int acpi_table_parse_srat (enum acpi_sra
 void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);
 void acpi_table_print_madt_entry (acpi_table_entry_header *madt);
 void acpi_table_print_srat_entry (acpi_table_entry_header *srat);
+int acpi_table_compute_checksum(void *table_pointer, unsigned long length);
 
 /* the following four functions are architecture-dependent */
 void acpi_numa_slit_init (struct acpi_table_slit *slit);