Commit 73577d1d authored May 12, 2014 by Lv Zheng Committed by Rafael J. Wysocki May 17, 2014

ACPI: Fix conflict between customized DSDT and DSDT local copy

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>
Cc: 2.6.35+ <stable@vger.kernel.org> # 2.6.35+
[rjw: Subject]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent d6d211db

drivers/acpi/bus.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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 = {
		/*