---

 b/drivers/acpi/osl.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN drivers/acpi/osl.c~acpi-off-but-still-called drivers/acpi/osl.c
--- a/drivers/acpi/osl.c~acpi-off-but-still-called	2017-11-27 08:05:53.161611164 -0800
+++ b/drivers/acpi/osl.c	2017-11-27 08:06:55.288611009 -0800
@@ -191,6 +191,8 @@ acpi_physical_address __init acpi_os_get
 {
 	acpi_physical_address pa = 0;
 
+	if (acpi_disabled)
+		return pa;
 #ifdef CONFIG_KEXEC
 	if (acpi_rsdp)
 		return acpi_rsdp;
@@ -318,6 +320,8 @@ acpi_os_map_iomem(acpi_physical_address
 	acpi_physical_address pg_off;
 	acpi_size pg_sz;
 
+	WARN_ON(acpi_disabled);
+
 	if (phys > ULONG_MAX) {
 		printk(KERN_ERR PREFIX "Cannot map memory that high\n");
 		return NULL;
_