| Message ID | 201207232101.02472.rjw@sisk.pl (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Jul 23, 2012 at 09:01:02PM +0200, Rafael J. Wysocki wrote: > > If CONFIG_ACPI_SLEEP is unset, the compiler complains that > pwr_btn_event_pending is defined but not used. To silence the > warning, move the definition of pwr_btn_event_pending under an > appropriate #ifdef. > > Reported-by: Paul E. McKenney <paul.mckenney@linaro.org> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Tested-by: Paul E. McKenney <paul.mckenney@linaro.org> > --- > drivers/acpi/sleep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: linux/drivers/acpi/sleep.c > =================================================================== > --- linux.orig/drivers/acpi/sleep.c > +++ linux/drivers/acpi/sleep.c > @@ -57,7 +57,6 @@ MODULE_PARM_DESC(gts, "Enable evaluation > MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".); > > static u8 sleep_states[ACPI_S_STATE_COUNT]; > -static bool pwr_btn_event_pending; > > static void acpi_sleep_tts_switch(u32 acpi_state) > { > @@ -110,6 +109,7 @@ static int acpi_sleep_prepare(u32 acpi_s > > #ifdef CONFIG_ACPI_SLEEP > static u32 acpi_target_sleep_state = ACPI_STATE_S0; > +static bool pwr_btn_event_pending; > > /* > * The ACPI specification wants us to save NVS memory regions during hibernation > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Applied. thanks, Len Brown, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux/drivers/acpi/sleep.c =================================================================== --- linux.orig/drivers/acpi/sleep.c +++ linux/drivers/acpi/sleep.c @@ -57,7 +57,6 @@ MODULE_PARM_DESC(gts, "Enable evaluation MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".); static u8 sleep_states[ACPI_S_STATE_COUNT]; -static bool pwr_btn_event_pending; static void acpi_sleep_tts_switch(u32 acpi_state) { @@ -110,6 +109,7 @@ static int acpi_sleep_prepare(u32 acpi_s #ifdef CONFIG_ACPI_SLEEP static u32 acpi_target_sleep_state = ACPI_STATE_S0; +static bool pwr_btn_event_pending; /* * The ACPI specification wants us to save NVS memory regions during hibernation
If CONFIG_ACPI_SLEEP is unset, the compiler complains that pwr_btn_event_pending is defined but not used. To silence the warning, move the definition of pwr_btn_event_pending under an appropriate #ifdef. Reported-by: Paul E. McKenney <paul.mckenney@linaro.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> --- drivers/acpi/sleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html