releases/3.4.96/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch

   1 From 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 Mon Sep 17 00:00:00 2001
   2 From: Lv Zheng <lv.zheng@intel.com>
   3 Date: Mon, 12 May 2014 15:50:16 +0800
   4 Subject: ACPI: Fix conflict between customized DSDT and DSDT local copy
   5
   6 From: Lv Zheng <lv.zheng@intel.com>
   7
   8 commit 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 upstream.
   9
  10 This patch fixes the following issue:
  11 If DSDT is customized, no local DSDT copy is needed.
  12
  13 References: https://bugzilla.kernel.org/show_bug.cgi?id=69711
  14 Signed-off-by: Enrico Etxe Arte <goitizena.generoa@gmail.com>
  15 Signed-off-by: Lv Zheng <lv.zheng@intel.com>
  16 [rjw: Subject]
  17 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/acpi/bus.c |    7 +++++++
  22  1 file changed, 7 insertions(+)
  23
  24 --- a/drivers/acpi/bus.c
  25 +++ b/drivers/acpi/bus.c
  26 @@ -57,6 +57,12 @@ EXPORT_SYMBOL(acpi_root_dir);
  27
  28
  29  #ifdef CONFIG_X86
  30 +#ifdef CONFIG_ACPI_CUSTOM_DSDT
  31 +static inline int set_copy_dsdt(const struct dmi_system_id *id)
  32 +{
  33 +       return 0;
  34 +}
  35 +#else
  36  static int set_copy_dsdt(const struct dmi_system_id *id)
  37  {
  38         printk(KERN_NOTICE "%s detected - "
  39 @@ -64,6 +70,7 @@ static int set_copy_dsdt(const struct dm
  40         acpi_gbl_copy_dsdt_locally = 1;
  41         return 0;
  42  }
  43 +#endif
  44
  45  static struct dmi_system_id dsdt_dmi_table[] __initdata = {
  46         /*