[PATCH] ACPI suspend: Fix CONFIG_ACPI_SLEEP dependence and some compilation warnings (was: Re: [announce] new tree: "fix all build warnings, on all configs")
From: Rafael J. Wysocki
Date: Wed Oct 22 2008 - 08:19:29 EST
On Wednesday, 22 of October 2008, Len Brown wrote:
> > > drivers/acpi/sleep/main.c:67: warning: âacpi_pm_disable_gpesâ defined but not used
> > >
> > > Shows that this code has an identity crisis due to a maze of #ifdefs, in
> > > the PM_SLEEP && !SUSPEND && !HIBERNATION case for example.
> > This case is invalid, because PM_SLEEP == SUSPEND || HIBERNATION !
> I though so too, but 2.6.27 appears to have added XEN to the mix:
> config PM_SLEEP
> depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
Yeah, which breaks things. :-(
The patch below should fix it and BTW I think ACPI_SLEEP should not depend
on XEN_SAVE_RESTORE anyway, so this is a bug fix really (please consider as
.28 material, probably -stable too).
From: Rafael J. Wysocki <rjw@xxxxxxx>
ACPI suspend: Fix CONFIG_ACPI_SLEEP dependence and some compilation warnings
Initially CONFIG_PM_SLEEP was defined as
CONFIG_SUSPEND || CONFIG_HIBERNATION and some ACPI code, most
importantly the code in drivers/acpi/main.c, was written with this
assumption. Currently, however, CONFIG_PM_SLEEP is also set when
CONFIG_XEN_SAVE_RESTORE is set.
This causes some compilation warnings to appear in
drivers/acpi/main.c if both CONFIG_SUSPEND and CONFIG_HIBERNATION
are unset and CONFIG_PM_SLEEP is set (this was impossible before).
To fix this problem, redefine CONFIG_ACPI_SLEEP do depend directly
on CONFIG_SUSPEND || CONFIG_HIBERNATION, as originally intended, and
use it instead of CONFIG_PM_SLEEP in drivers/acpi/main.c, wherever
Additionally, move the acpi_target_sleep_state definition from under
the #ifdef to prevent compilation from failing in some cases.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
drivers/acpi/Kconfig | 2 +-
drivers/acpi/sleep/main.c | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
@@ -42,7 +42,7 @@ if ACPI
- depends on PM_SLEEP
+ depends on SUSPEND || HIBERNATION
@@ -23,6 +23,7 @@
+static u32 acpi_target_sleep_state = ACPI_STATE_S0;
static int acpi_sleep_prepare(u32 acpi_state)
@@ -45,9 +46,7 @@ static int acpi_sleep_prepare(u32 acpi_s
-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'
@@ -132,7 +131,7 @@ static void acpi_pm_end(void)
acpi_target_sleep_state = ACPI_STATE_S0;
-#endif /* CONFIG_PM_SLEEP */
+#endif /* CONFIG_ACPI_SLEEP */
extern void do_suspend_lowlevel(void);
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/