ACPI: Fix conflict between customized DSDT and DSDT local copy
commit 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 upstream. This patch fixes the following issue: If DSDT is customized, no local DSDT copy is needed. References: https://bugzilla.kernel.org/show_bug.cgi?id=69711 Signed-off-by: Enrico Etxe Arte <goitizena.generoa@gmail.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> [rjw: Subject] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5e43bc687f
commit
8df7e87020
|
@ -57,6 +57,12 @@ EXPORT_SYMBOL(acpi_root_dir);
|
|||
|
||||
|
||||
#ifdef CONFIG_X86
|
||||
#ifdef CONFIG_ACPI_CUSTOM_DSDT
|
||||
static inline int set_copy_dsdt(const struct dmi_system_id *id)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static int set_copy_dsdt(const struct dmi_system_id *id)
|
||||
{
|
||||
printk(KERN_NOTICE "%s detected - "
|
||||
|
@ -64,6 +70,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
|
|||
acpi_gbl_copy_dsdt_locally = 1;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct dmi_system_id dsdt_dmi_table[] __initdata = {
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue