New patch to review for coreboot: 45983d1 ACPI: Hide acpi_slp_type

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10360

-gerrit

commit 45983d13bd55e4ec92ff1ad90ec26879ee1a1be8
Author: Kyösti Mälkki 
Date:   Fri May 29 06:17:23 2015 +0300

ACPI: Hide acpi_slp_type

Change-Id: I48a20e34f11adc7c61d0ce6b3c005dbd712fbcac
    Signed-off-by: Kyösti Mälkki 
---
 src/arch/x86/boot/acpi.c         | 2 +-
 src/arch/x86/include/arch/acpi.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index a7a638f..94845e9 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -919,7 +919,7 @@ void acpi_resume(void *wake_vec)
 }

/* 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 10db820..3e81131 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -578,7 +578,6 @@ static inline int acpi_s3_resume_allowed(void)
 }

#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
-extern int acpi_slp_type;

#ifdef __PRE_RAM__
 static inline int acpi_is_wakeup_s3(void)
@@ -591,7 +590,6 @@ int acpi_is_wakeup_s3(void);
 #endif

#else
-#define acpi_slp_type 0
 static inline int acpi_is_wakeup(void) { return 0; }
 static inline int acpi_is_wakeup_s3(void) { return 0; }
 #endif