* [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path
@ 2011-12-01 15:45 Srivatsa S. Bhat
2011-12-01 21:52 ` Rafael J. Wysocki
2011-12-02 19:34 ` Pavel Machek
0 siblings, 2 replies; 3+ messages in thread
From: Srivatsa S. Bhat @ 2011-12-01 15:45 UTC (permalink / raw)
To: rjw; +Cc: pavel, len.brown, linux-kernel, linux-pm
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@linux.vnet.ibm.com>
---
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();
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path
2011-12-01 15:45 [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path Srivatsa S. Bhat
@ 2011-12-01 21:52 ` Rafael J. Wysocki
2011-12-02 19:34 ` Pavel Machek
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2011-12-01 21:52 UTC (permalink / raw)
To: Srivatsa S. Bhat; +Cc: pavel, len.brown, linux-kernel, linux-pm
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@linux.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();
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path
2011-12-01 15:45 [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path Srivatsa S. Bhat
2011-12-01 21:52 ` Rafael J. Wysocki
@ 2011-12-02 19:34 ` Pavel Machek
1 sibling, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2011-12-02 19:34 UTC (permalink / raw)
To: Srivatsa S. Bhat; +Cc: rjw, len.brown, linux-kernel, linux-pm
> 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@linux.vnet.ibm.com>
Ack.
> ---
>
> 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();
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-02 19:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-01 15:45 [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path Srivatsa S. Bhat
2011-12-01 21:52 ` Rafael J. Wysocki
2011-12-02 19:34 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®