Re: [PATCH v2] ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
From: Rafael J. Wysocki <hidden>
Date: 2012-10-24 22:08:20
Also in:
lkml
On Tuesday 16 of October 2012 13:24:12 Yuanhan Liu wrote:
acpi_no_s4_hw_signature is defined in #ifdef CONFIG_HIBERNATION block, but the current code put the declaration in #ifdef CONFIG_PM_SLEEP block. I happened to meet this issue when I turned off PM_SLEEP config manually: arch/x86/kernel/acpi/sleep.c:100:4: error: implicit declaration of function ‘acpi_no_s4_hw_signature’ [-Werror=implicit-function-declaration] v2: take better title and add build error message suggested by Fengguang Signed-off-by: Yuanhan Liu <redacted> Reviewed-by: Fengguang Wu <redacted>
Applied to linux-pm.git/acpi-next as v3.8 material. Thanks, Rafael
quoted hunk ↗ jump to hunk
--- include/linux/acpi.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 90be989..a468429 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h@@ -257,8 +257,11 @@ int acpi_check_region(resource_size_t start, resource_size_t n, int acpi_resources_are_enforced(void); -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_HIBERNATION void __init acpi_no_s4_hw_signature(void); +#endif + +#ifdef CONFIG_PM_SLEEP void __init acpi_old_suspend_ordering(void); void __init acpi_nvs_nosave(void); #endif /* CONFIG_PM_SLEEP */
-- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.