Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

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

1 files changed, 2 insertions, 1 deletions

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