diff options
author | Lv Zheng <lv.zheng@intel.com> | 2015-04-12 23:49:47 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-14 08:51:53 -0400 |
commit | 27c481f37f915cfb7dbaf0025075a1358e45c889 (patch) | |
tree | 1a864abe05b751ae31e247ff76a11a927842fcfa /drivers/acpi/acpica | |
parent | 6306bf886222f382d59bbb8b72bf6996cbba1f6e (diff) |
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>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r-- | drivers/acpi/acpica/acresrc.h | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/rsdump.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h index 959be910aed2..ac20b9dcf7ea 100644 --- a/drivers/acpi/acpica/acresrc.h +++ b/drivers/acpi/acpica/acresrc.h | |||
@@ -301,9 +301,11 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length, | |||
301 | /* | 301 | /* |
302 | * rsdump | 302 | * rsdump |
303 | */ | 303 | */ |
304 | #ifdef ACPI_EXEC_APP | ||
304 | void acpi_rs_dump_resource_list(struct acpi_resource *resource); | 305 | void acpi_rs_dump_resource_list(struct acpi_resource *resource); |
305 | 306 | ||
306 | void acpi_rs_dump_irq_list(u8 *route_table); | 307 | void acpi_rs_dump_irq_list(u8 *route_table); |
308 | #endif | ||
307 | 309 | ||
308 | /* | 310 | /* |
309 | * Resource conversion tables | 311 | * Resource conversion tables |
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c index 8d4f26295db6..6d588d4bae9c 100644 --- a/drivers/acpi/acpica/rsdump.c +++ b/drivers/acpi/acpica/rsdump.c | |||
@@ -355,6 +355,7 @@ static void acpi_rs_dump_address_common(union acpi_resource_data *resource) | |||
355 | acpi_rs_dump_descriptor(resource, acpi_rs_dump_general_flags); | 355 | acpi_rs_dump_descriptor(resource, acpi_rs_dump_general_flags); |
356 | } | 356 | } |
357 | 357 | ||
358 | #ifdef ACPI_EXEC_APP | ||
358 | /******************************************************************************* | 359 | /******************************************************************************* |
359 | * | 360 | * |
360 | * FUNCTION: acpi_rs_dump_resource_list | 361 | * FUNCTION: acpi_rs_dump_resource_list |
@@ -464,6 +465,7 @@ void acpi_rs_dump_irq_list(u8 *route_table) | |||
464 | prt_element, prt_element->length); | 465 | prt_element, prt_element->length); |
465 | } | 466 | } |
466 | } | 467 | } |
468 | #endif | ||
467 | 469 | ||
468 | /******************************************************************************* | 470 | /******************************************************************************* |
469 | * | 471 | * |