Messages in this thread | | | Date | Fri, 2 Dec 2011 20:34:52 +0100 | From | Pavel Machek <> | Subject | Re: [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path |
| |
> 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
| |