[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <201112012252.47344.rjw@sisk.pl>
Date: Thu, 1 Dec 2011 22:52:47 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: "Srivatsa S. Bhat" <srivatsa.bhat@...ux.vnet.ibm.com>
Cc: pavel@....cz, len.brown@...el.com, linux-kernel@...r.kernel.org,
linux-pm@...r.kernel.org
Subject: Re: [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path
On Thursday, December 01, 2011, Srivatsa S. Bhat wrote:
> In the software_resume() function defined in kernel/power/hibernate.c,
> if the call to create_basic_memory_bitmaps() fails, the usermodehelpers
> are not enabled (which had been disabled in the previous step). Fix it.
>
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@...ux.vnet.ibm.com>
Applied to linux-pm/linux-next.
Thanks,
Rafael
> ---
>
> kernel/power/hibernate.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index a6b0503..df35313 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -811,8 +811,10 @@ static int software_resume(void)
> goto close_finish;
>
> error = create_basic_memory_bitmaps();
> - if (error)
> + if (error) {
> + usermodehelper_enable();
> goto close_finish;
> + }
>
> pr_debug("PM: Preparing processes for restore.\n");
> error = prepare_processes();
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists