GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2015-05-29 06:17:23 +03:00
parent 1b7609c0e8
commit 803acfa064
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/acpi_s3.c
View File

@ -27,7 +27,7 @@
#if ENV_RAMSTAGE #if ENV_RAMSTAGE
/* This is filled with acpi_is_wakeup() call early in 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) #if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)
int acpi_get_sleep_type(void) int acpi_get_sleep_type(void)

2
src/arch/x86/include/arch/acpi.h
View File

@ -691,7 +691,6 @@ static inline int acpi_s3_resume_allowed(void)
void *acpi_backup_container(uintptr_t base, size_t size); void *acpi_backup_container(uintptr_t base, size_t size);
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) #if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
extern int acpi_slp_type;
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
static inline int acpi_is_wakeup_s3(void) static inline int acpi_is_wakeup_s3(void)
@ -706,7 +705,6 @@ int acpi_is_wakeup_s4(void);
void acpi_prepare_for_resume(void); void acpi_prepare_for_resume(void);
#else #else
#define acpi_slp_type ACPI_S0
static inline int acpi_is_wakeup(void) { return 0; } 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_s3(void) { return 0; }
static inline int acpi_is_wakeup_s4(void) { return 0; } static inline int acpi_is_wakeup_s4(void) { return 0; }