diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2014-05-12 15:50:16 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:11:58 -0700 |
| commit | 3dd4627f51cd62ccb8bcfcdd069b041a102711e7 (patch) | |
| tree | 31a58af1c92bd46d151fe055d32cf7244f458bf9 | |
| parent | f445789dcf3896215254dec320ac91cd69f7b61f (diff) | |
| download | linux-stable-3dd4627f51cd62ccb8bcfcdd069b041a102711e7.tar.gz linux-stable-3dd4627f51cd62ccb8bcfcdd069b041a102711e7.tar.bz2 linux-stable-3dd4627f51cd62ccb8bcfcdd069b041a102711e7.zip | |
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>
| -rw-r--r-- | drivers/acpi/bus.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index fcb59c21c68d..b48aefab57e8 100644 --- 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 dmi_system_id *id) acpi_gbl_copy_dsdt_locally = 1; return 0; } +#endif static struct dmi_system_id dsdt_dmi_table[] __initdata = { /* |