X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Facpi%2Facpica%2Ftbutils.c;h=9684cc827930c7e4682aab1d16ae98fcdbb12ab1;hb=d0302bc62af7983040ea1cd1b5dd2b36e1a6a509;hp=3a8d8d2eee9210ee17ce21e2892b722837152f36;hpb=106ad8d6b0a7c1a597fab56ec692c39f553fabbc;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 3a8d8d2eee92..9684cc827930 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -445,7 +445,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
 
 	/* Differentiate between RSDT and XSDT root tables */
 
-	if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {
+	if (rsdp->revision > 1 && rsdp->xsdt_physical_address
+			&& !acpi_rsdt_forced) {
 		/*
 		 * Root table is an XSDT (64-bit physical addresses). We must use the
 		 * XSDT if the revision is > 1 and the XSDT pointer is present, as per