Pārlūkot izejas kodu

ACPICA: Resources: Correct conditional compilation definitions.

ACPICA commit f92a08512b0b35dce4a7fc6a73216674a3c2541b

Some conditional compilation definitions are wrong across header and source
files. This patch corrects them for the resources component.

NOTE that a further patch in this patchset cleans up all ACPI_EXEC_APP,
converting them into ACPI_DEBUGGER, including part of this change.

Link: https://github.com/acpica/acpica/commit/f92a0851
Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Lv Zheng 10 gadi atpakaļ
vecāks
revīzija
27c481f37f
2 mainītis faili ar 4 papildinājumiem un 0 dzēšanām
  1. 2 0
      drivers/acpi/acpica/acresrc.h
  2. 2 0
      drivers/acpi/acpica/rsdump.c

+ 2 - 0
drivers/acpi/acpica/acresrc.h

@@ -301,9 +301,11 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
 /*
 /*
  * rsdump
  * rsdump
  */
  */
+#ifdef ACPI_EXEC_APP
 void acpi_rs_dump_resource_list(struct acpi_resource *resource);
 void acpi_rs_dump_resource_list(struct acpi_resource *resource);
 
 
 void acpi_rs_dump_irq_list(u8 *route_table);
 void acpi_rs_dump_irq_list(u8 *route_table);
+#endif
 
 
 /*
 /*
  * Resource conversion tables
  * Resource conversion tables

+ 2 - 0
drivers/acpi/acpica/rsdump.c

@@ -355,6 +355,7 @@ static void acpi_rs_dump_address_common(union acpi_resource_data *resource)
 	acpi_rs_dump_descriptor(resource, acpi_rs_dump_general_flags);
 	acpi_rs_dump_descriptor(resource, acpi_rs_dump_general_flags);
 }
 }
 
 
+#ifdef ACPI_EXEC_APP
 /*******************************************************************************
 /*******************************************************************************
  *
  *
  * FUNCTION:    acpi_rs_dump_resource_list
  * FUNCTION:    acpi_rs_dump_resource_list
@@ -464,6 +465,7 @@ void acpi_rs_dump_irq_list(u8 *route_table)
 					   prt_element, prt_element->length);
 					   prt_element, prt_element->length);
 	}
 	}
 }
 }
+#endif
 
 
 /*******************************************************************************
 /*******************************************************************************
  *
  *