next-20140312 - build error in drivers/acpi/sleep.c

[Valdis Kletnieks]

Seen in the most recent linux-next with a CONFIG_SUSPEND=n .config:

  CC      drivers/acpi/sleep.o
drivers/acpi/sleep.c: In function 'acpi_sleep_init':
drivers/acpi/sleep.c:808:2: error: implicit declaration of function 'acpi_sleep_state_supported' [-Werror=implicit-function-declaration]
  if (acpi_sleep_state_supported(ACPI_STATE_S5)) {
  ^
cc1: some warnings being treated as errors
make[2]: *** [drivers/acpi/sleep.o] Error 1
make[1]: *** [drivers/acpi] Error 2
make: *** [drivers] Error 2

Function is defined inside a #ifdef CONFIG_SUSPEND, but used outside of
one in acpi_sleep_init().

git blame points at commit eaa54ccbc:

commit eaa54ccbcf81de987e6978ad457cc9e425b7a8db
Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Date:   Tue Mar 11 14:08:58 2014 +0100

    ACPI / sleep: Add extra checks for HW Reduced ACPI mode sleep states

    If the HW Reduced ACPI mode bit is set in the FADT, ACPICA uses
    the optional sleep control and sleep status registers for making
    the system enter sleep states (including S5), so it is not possible
    to use system sleep states or power it off using ACPI if the HW
    Reduced ACPI mode bit is set and those registers are not available.

    For this reason, add a new function, acpi_sleep_state_supported(),
    checking if the HW Reduced ACPI mode bit is set and whether or not
    system sleep states are usable in that case in addition to checking
    the return value of acpi_get_sleep_type_data() and make the ACPI
    sleep setup routines use that function to check the availability of
    system sleep states.

Attachment: pgpsOHJxkMbEO.pgp
Description: PGP signature