On Thursday, 23 of October 2008, Len Brown wrote:
> From: Len Brown <len.brown@xxxxxxxxx>
>
> drivers/acpi/sleep/main.c:27: warning: ‘acpi_target_sleep_state’ defined but not used
Er, wrong.
This breaks compilation for ACPI_SLEEP=n and XEN_SAVE_RESTORE=y.
The patch below fixes the breakage.
> Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
> ---
> drivers/acpi/sleep/main.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
> index 7603788..26571ba 100644
> --- a/drivers/acpi/sleep/main.c
> +++ b/drivers/acpi/sleep/main.c
> @@ -24,7 +24,6 @@
> #include "sleep.h"
>
> u8 sleep_states[ACPI_S_STATE_COUNT];
> -static u32 acpi_target_sleep_state = ACPI_STATE_S0;
>
> static void acpi_sleep_tts_switch(u32 acpi_state)
> {
> @@ -78,6 +77,7 @@ static int acpi_sleep_prepare(u32 acpi_state)
> }
>
> #ifdef CONFIG_ACPI_SLEEP
> +static u32 acpi_target_sleep_state = ACPI_STATE_S0;
> /*
> * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the
> * user to request that behavior by using the 'acpi_old_suspend_ordering'
---
From: Rafael J. Wysocki <rjw@xxxxxxx>
ACPI suspend: Fox compilation for ACPI_SLEEP unset and XEN_SAVE_RESTORE set
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
---
drivers/acpi/sleep/main.c | 2 ++
1 file changed, 2 insertions(+)
Index: linux-2.6/drivers/acpi/sleep/main.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/main.c
+++ linux-2.6/drivers/acpi/sleep/main.c
@@ -163,6 +163,8 @@ static void acpi_pm_end(void)
acpi_target_sleep_state = ACPI_STATE_S0;
acpi_sleep_tts_switch(acpi_target_sleep_state);
}
+#else /* !CONFIG_ACPI_SLEEP */
+#define acpi_target_sleep_state ACPI_STATE_S0
#endif /* CONFIG_ACPI_SLEEP */
#ifdef CONFIG_SUSPEND
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
