Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/10360
-gerrit
commit a506a5b09ab7628d7a8d0172fec8f434e5839a9d Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Fri May 29 06:17:23 2015 +0300
ACPI S3: Hide acpi_slp_type
Change-Id: I48a20e34f11adc7c61d0ce6b3c005dbd712fbcac Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/arch/x86/acpi_s3.c | 2 +- src/arch/x86/include/arch/acpi.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index f3cb097..0fc1914 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 7c29648..6854573 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; }