From f2c386eee6b011256e557d7367bfdb17c05abde5 Mon Sep 17 00:00:00 2001
From: Robert Moore <Robert.Moore@intel.com>
Date: Wed, 25 Sep 2013 13:56:13 -0700
Subject: [PATCH] Cleanup global variable that is used only by OSL code.

Move AcpiGbl_DebugTimeout from AcpiExec to the OSL layer so that
any new utilities linked to the OSL file(s) won't have to define
it in order to link. Lv Zheng.
---
 source/os_specific/service_layers/osunixxf.c | 1 +
 source/os_specific/service_layers/oswinxf.c  | 2 +-
 source/tools/acpiexec/aemain.c               | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/os_specific/service_layers/osunixxf.c b/source/os_specific/service_layers/osunixxf.c
index 4e0e98421..7aa41681c 100644
--- a/source/os_specific/service_layers/osunixxf.c
+++ b/source/os_specific/service_layers/osunixxf.c
@@ -139,6 +139,7 @@
 
 extern FILE                    *AcpiGbl_DebugFile;
 FILE                           *AcpiGbl_OutputFile;
+BOOLEAN                        AcpiGbl_DebugTimeout = FALSE;
 
 
 /* Upcalls to AcpiExec */
diff --git a/source/os_specific/service_layers/oswinxf.c b/source/os_specific/service_layers/oswinxf.c
index 8e4fbd7ef..990bccb7a 100644
--- a/source/os_specific/service_layers/oswinxf.c
+++ b/source/os_specific/service_layers/oswinxf.c
@@ -137,7 +137,6 @@
 
 
 extern FILE                 *AcpiGbl_DebugFile;
-extern BOOLEAN              AcpiGbl_DebugTimeout;
 
 FILE                        *AcpiGbl_OutputFile;
 UINT64                      TimerFrequency;
@@ -180,6 +179,7 @@ ACPI_OS_SEMAPHORE_INFO          AcpiGbl_Semaphores[ACPI_OS_MAX_SEMAPHORES];
 
 #endif /* ACPI_SINGLE_THREADED */
 
+BOOLEAN                         AcpiGbl_DebugTimeout = FALSE;
 
 /******************************************************************************
  *
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index f2f0e4ff0..7bd2cdd70 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -131,6 +131,8 @@
  * expand wildcards.
  */
 
+extern BOOLEAN              AcpiGbl_DebugTimeout;
+
 /* Local prototypes */
 
 static int
@@ -158,7 +160,6 @@ AcpiDbRunBatchMode (
 UINT8                       AcpiGbl_RegionFillValue = 0;
 BOOLEAN                     AcpiGbl_IgnoreErrors = FALSE;
 BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport = FALSE;
-BOOLEAN                     AcpiGbl_DebugTimeout = FALSE;
 UINT8                       AcpiGbl_UseHwReducedFadt = FALSE;
 BOOLEAN                     AcpiGbl_DoInterfaceTests = FALSE;
 static UINT8                AcpiGbl_ExecutionMode = AE_MODE_COMMAND_LOOP;