From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Jun 2014 23:46:35 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.96~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=204db87dd9db1757199c10768ca3a1d1d70bed71;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch
---

diff --git a/queue-3.4/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch b/queue-3.4/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch
new file mode 100644
index 00000000000..fcdb8ed9a0a
--- /dev/null
+++ b/queue-3.4/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch
@@ -0,0 +1,46 @@
+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
+@@ -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 dm
+ 	acpi_gbl_copy_dsdt_locally = 1;
+ 	return 0;
+ }
++#endif
+ 
+ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+ 	/*
diff --git a/queue-3.4/series b/queue-3.4/series
index ce1f7a596eb..b02b0778d0e 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -26,3 +26,4 @@ usb-sierra-fix-use-after-free-at-suspend-resume.patch
 usb-sierra-fix-urb-and-memory-leak-in-resume-error-path.patch
 usb-sierra-fix-urb-and-memory-leak-on-disconnect.patch
 usb-sierra-fix-remote-wakeup.patch
+acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch