On Friday, May 31, 2013 05:47:43 PM Bernie Thompson wrote:
> This adds in a new message to the wakeup code which adds an indication to
> the log that suspend was cancelled due to a wake event occouring during
> the suspend sequence. It also adjusts the message printed in suspend.c to
> reflect the potential that a suspend was aborted, as opposed to a device
> failing to suspend.
>
> Without these message adjustments one can end up with a kernel log that says
> that a device failed to suspend with no actual device suspend failures,
> which can be confusing to the log examiner.
>
> Signed-off-by: Bernie Thompson <bhthomp...@chromium.org>
Queued up for 3.11.
Thanks,
Rafael
> ---
> drivers/base/power/wakeup.c | 4 +++-
> kernel/power/suspend.c | 2 +-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
> index 79715e7..407a2ef 100644
> --- a/drivers/base/power/wakeup.c
> +++ b/drivers/base/power/wakeup.c
> @@ -707,8 +707,10 @@ bool pm_wakeup_pending(void)
> }
> spin_unlock_irqrestore(&events_lock, flags);
>
> - if (ret)
> + if (ret) {
> + pr_info("PM: Wakeup pending, aborting suspend\n");
> print_active_wakeup_sources();
> + }
>
> return ret;
> }
> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
> index bef86d1..ece0422 100644
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -269,7 +269,7 @@ int suspend_devices_and_enter(suspend_state_t state)
> suspend_test_start();
> error = dpm_suspend_start(PMSG_SUSPEND);
> if (error) {
> - printk(KERN_ERR "PM: Some devices failed to suspend\n");
> + pr_err("PM: Some devices failed to suspend, or early wake event
> detected\n");
> goto Recover_platform;
> }
> suspend_test_finish("suspend devices");
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
