This patch fixes the following issue: If DSDT is customized, no local DSDT copy is needed. Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=69711 Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> Signed-off-by: Enrico Etxe Arte <goitizena.generoa@xxxxxxxxx> --- drivers/acpi/bus.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index e7e5844..c113e82 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -52,13 +52,20 @@ struct proc_dir_entry *acpi_root_dir; EXPORT_SYMBOL(acpi_root_dir); #ifdef CONFIG_X86 +#ifndef CONFIG_ACPI_CUSTOM_DSDT static int set_copy_dsdt(const struct dmi_system_id *id) { - printk(KERN_NOTICE "%s detected - " + pr_info("ACPI: %s detected - " "force copy of DSDT to local memory\n", id->ident); acpi_gbl_copy_dsdt_locally = 1; return 0; } +#else +static inline int set_copy_dsdt(const struct dmi_system_id *id) +{ + return 0; +} +#endif static struct dmi_system_id dsdt_dmi_table[] __initdata = { /* -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
