aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Kaneda <erik.kaneda@intel.com>2020-05-04 17:46:50 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-05-09 10:55:53 +0200
commit2c1779f5ad32fbd5f88aa6cb59d670ba6789d3b8 (patch)
tree433c580623dd60be4b599019419fb4a0a2e0ed45
parentACPICA: Make acpi_protocol_lengths static (diff)
downloadlinux-dev-2c1779f5ad32fbd5f88aa6cb59d670ba6789d3b8.tar.xz
linux-dev-2c1779f5ad32fbd5f88aa6cb59d670ba6789d3b8.zip
ACPICA: Move acpi_gbl_next_cmd_num definition to acglobal.h
ACPICA commit 8296a24f33984c26a61103c590b049de3c9b61ff This commit cleans up the code by moving the global definition out of dbhistry.c to acglobal.h. Link: https://github.com/acpica/acpica/commit/8296a24f Reported-by: Hulk Robot <hulkci@huawei.com> Suggested-by: Jason Yan <yanaijie@huawei.com> 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>
-rw-r--r--drivers/acpi/acpica/acglobal.h1
-rw-r--r--drivers/acpi/acpica/dbhistry.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 38ffa2c0a496..1030a0ce1599 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -290,6 +290,7 @@ ACPI_GLOBAL(struct acpi_external_file *, acpi_gbl_external_file_list);
#ifdef ACPI_DEBUGGER
ACPI_INIT_GLOBAL(u8, acpi_gbl_abort_method, FALSE);
ACPI_INIT_GLOBAL(acpi_thread_id, acpi_gbl_db_thread_id, ACPI_INVALID_THREAD_ID);
+ACPI_INIT_GLOBAL(u32, acpi_gbl_next_cmd_num, 1);
ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_ini_methods);
ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_region_support);
diff --git a/drivers/acpi/acpica/dbhistry.c b/drivers/acpi/acpica/dbhistry.c
index bb9600b867ee..f5fba14461a6 100644
--- a/drivers/acpi/acpica/dbhistry.c
+++ b/drivers/acpi/acpica/dbhistry.c
@@ -27,7 +27,6 @@ static HISTORY_INFO acpi_gbl_history_buffer[HISTORY_SIZE];
static u16 acpi_gbl_lo_history = 0;
static u16 acpi_gbl_num_history = 0;
static u16 acpi_gbl_next_history_index = 0;
-u32 acpi_gbl_next_cmd_num = 1;
/*******************************************************************************
*