summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2015-05-29 06:17:23 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2016-12-11 09:00:40 +0100
commit803acfa064c7e58901193571a0c293a19abb60f7 (patch)
treef9c69541f7683db9c85fa9750b7055cb12c5548f
parent1b7609c0e88ba820dbc2251fad0d994e2b54a154 (diff)
ACPI S3: Hide acpi_slp_type
Change-Id: I48a20e34f11adc7c61d0ce6b3c005dbd712fbcac Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/10360 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/arch/x86/acpi_s3.c2
-rw-r--r--src/arch/x86/include/arch/acpi.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index f3cb0971db..0fc1914bef 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -27,7 +27,7 @@
#if ENV_RAMSTAGE
/* This is filled with acpi_is_wakeup() call early in ramstage. */
-int acpi_slp_type = -1;
+static int acpi_slp_type = -1;
#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)
int acpi_get_sleep_type(void)
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 7c296480bc..6854573d8c 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -691,7 +691,6 @@ static inline int acpi_s3_resume_allowed(void)
void *acpi_backup_container(uintptr_t base, size_t size);
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
-extern int acpi_slp_type;
#ifdef __PRE_RAM__
static inline int acpi_is_wakeup_s3(void)
@@ -706,7 +705,6 @@ int acpi_is_wakeup_s4(void);
void acpi_prepare_for_resume(void);
#else
-#define acpi_slp_type ACPI_S0
static inline int acpi_is_wakeup(void) { return 0; }
static inline int acpi_is_wakeup_s3(void) { return 0; }
static inline int acpi_is_wakeup_s4(void) { return 0; }