| From 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 Mon Sep 17 00:00:00 2001 |
| From: Lv Zheng <lv.zheng@intel.com> |
| Date: Mon, 12 May 2014 15:50:16 +0800 |
| Subject: ACPI: Fix conflict between customized DSDT and DSDT local copy |
| |
| From: Lv Zheng <lv.zheng@intel.com> |
| |
| 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> |
| |
| --- |
| drivers/acpi/bus.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- a/drivers/acpi/bus.c |
| +++ b/drivers/acpi/bus.c |
| @@ -52,6 +52,12 @@ struct proc_dir_entry *acpi_root_dir; |
| 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 - " |
| @@ -59,6 +65,7 @@ static int set_copy_dsdt(const struct dm |
| acpi_gbl_copy_dsdt_locally = 1; |
| return 0; |
| } |
| +#endif |
| |
| static struct dmi_system_id dsdt_dmi_table[] __initdata = { |
| /* |
