diff options
| author | Erik Kaneda <erik.kaneda@intel.com> | 2020-02-14 10:47:56 -0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-16 10:19:51 +0100 |
| commit | 9e43f5d544e40d64686a38372d41d8100401d28c (patch) | |
| tree | 40179dc96ad7754c9eaec364e79acb9a6088403b /drivers/acpi | |
| parent | 1f57e6a2c4ae3840449ea1c2708cea43aa15f3ec (diff) | |
ACPICA: ASL-ASL+ converter: make root file a parameter for cv_init_file_tree
ACPICA commit 5d160cc86cca440eac7055f981e48bc14d4eb9f7
This decouples cv_init_file_tree from acpi_gbl_output_file and allows
it to be called independently of acpi_os_redirect_output()
Link: https://github.com/acpica/acpica/commit/5d160cc8
Signed-off-by: Erik Kaneda <erik.kaneda@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')
| -rw-r--r-- | drivers/acpi/acpica/acconvert.h | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/acmacros.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/acconvert.h b/drivers/acpi/acpica/acconvert.h index 9eca93656116..cf85d66da6e7 100644 --- a/drivers/acpi/acpica/acconvert.h +++ b/drivers/acpi/acpica/acconvert.h @@ -65,7 +65,7 @@ void cg_write_aml_comment(union acpi_parse_object *op); /* * cvparser */ -void cv_init_file_tree(struct acpi_table_header *table); +void cv_init_file_tree(struct acpi_table_header *table, FILE * root_file); void cv_clear_op_comments(union acpi_parse_object *op); diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h index 87d06c963a60..168904ba3086 100644 --- a/drivers/acpi/acpica/acmacros.h +++ b/drivers/acpi/acpica/acmacros.h @@ -477,7 +477,7 @@ #define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d) cv_print_one_comment_type (a,b,c,d); #define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b) cv_print_one_comment_list (a,b); #define ASL_CV_FILE_HAS_SWITCHED(a) cv_file_has_switched(a) -#define ASL_CV_INIT_FILETREE(a) cv_init_file_tree(a); +#define ASL_CV_INIT_FILETREE(a,b) cv_init_file_tree(a,b); #else @@ -492,7 +492,7 @@ #define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d) #define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b) #define ASL_CV_FILE_HAS_SWITCHED(a) 0 -#define ASL_CV_INIT_FILETREE(a) +#define ASL_CV_INIT_FILETREE(a,b) #endif |