summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2018-01-04 00:06:26 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-01-05 01:33:22 +0100
commitee174d3594c2fe997f45cd0969a33e0413913706 (patch)
tree35543639cd17f07d2fa2e21f0b4ee71856f102e7
parentACPICA: Create and deploy safe version of strncpy (diff)
downloadlinux-ee174d3594c2fe997f45cd0969a33e0413913706.tar.xz
linux-ee174d3594c2fe997f45cd0969a33e0413913706.zip
ACPICA: Rename a global variable, no functional change
ACPICA commit ab9c83985e8b2b25dc1c173b753280a8d04922b5 Rename to add the standard prefix for globals. Link: https://github.com/acpica/acpica/commit/ab9c8398 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/acglobal.h2
-rw-r--r--drivers/acpi/acpica/psutils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 0c609f803ee1..45ef3f5dc9ad 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -245,7 +245,7 @@ ACPI_INIT_GLOBAL(union acpi_parse_object, *acpi_gbl_current_scope, NULL);
/* ASL/ASL+ converter */
-ACPI_INIT_GLOBAL(u8, gbl_capture_comments, FALSE);
+ACPI_INIT_GLOBAL(u8, acpi_gbl_capture_comments, FALSE);
ACPI_INIT_GLOBAL(struct acpi_comment_node, *acpi_gbl_last_list_head, NULL);
/*****************************************************************************
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 8bd7d01039cc..cd59dfe6a47d 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -161,7 +161,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml)
acpi_gbl_current_scope = op;
}
- if (gbl_capture_comments) {
+ if (acpi_gbl_capture_comments) {
ASL_CV_TRANSFER_COMMENTS(op);
}
}