Re: [PATCH] ACPI / PM: fix build regression

[Rafael J. Wysocki]

On Tue, Nov 7, 2017 at 11:48 AM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
> The XPS13 workaround caused a build regression in configurations without
> CONFIG_ACPI_SLEEP.
>
> drivers/acpi/sleep.c:95:5: error: redefinition of 'acpi_target_system_state'
>  u32 acpi_target_system_state(void)
>      ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from include/linux/acpi.h:44:0,
>                  from drivers/acpi/sleep.c:20:
> include/acpi/acpi_bus.h:661:19: note: previous definition of 'acpi_target_system_state' was here
>  static inline u32 acpi_target_system_state(void) { return ACPI_STATE_S0; }
>                    ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/acpi/sleep.c:495:13: error: 'acpi_pm_end' defined but not used [-Werror=unused-function]
>
> This adds back the #ifdef checks required to make it build cleanly again.
> The patch that caused the regression is marked for backports to v4.13, the
> same should apply to this one.
>
> Fixes: 8d7a4756fef9 ("ACPI / PM: Blacklist Low Power S0 Idle _DSM for Dell XPS13 9360")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

This should have been fixed in my tree already.

Unfortunately, linux-next picked up an earlier version with this issue.

Thanks,
Rafael