mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'acpi-bus' 

Merge ACPI core fix to avoid calling dmi_check_system() on non-x86.

* acpi-bus:
  ACPI / bus: Only call dmi_check_system() on X86
This commit is contained in:
Rafael J. Wysocki 2018-09-07 10:05:20 +02:00
parent f11fc4bc66 5d128fbd8b
commit a6b7eb3b41
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/acpi/bus.c
View File

@ -35,11 +35,11 @@
#include <linux/delay.h> #include <linux/delay.h>
#ifdef CONFIG_X86 #ifdef CONFIG_X86
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <linux/dmi.h>
#endif #endif
#include <linux/acpi_iort.h> #include <linux/acpi_iort.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <acpi/apei.h> #include <acpi/apei.h>
#include <linux/dmi.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include "internal.h" #include "internal.h"
@ -82,10 +82,6 @@ static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
}, },
{} {}
}; };
#else
static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
{}
};
#endif #endif
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
@ -1033,11 +1029,16 @@ void __init acpi_early_init(void)
acpi_permanent_mmap = true; acpi_permanent_mmap = true;
#ifdef CONFIG_X86
/* /*
* If the machine falls into the DMI check table, * If the machine falls into the DMI check table,
* DSDT will be copied to memory * DSDT will be copied to memory.
* Note that calling dmi_check_system() here on other architectures
* would not be OK because only x86 initializes dmi early enough.
* Thankfully only x86 systems need such quirks for now.
*/ */
dmi_check_system(dsdt_dmi_table); dmi_check_system(dsdt_dmi_table);
#endif
status = acpi_reallocate_root_table(); status = acpi_reallocate_root_table();
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {