lkml.org 
[lkml]   [2011]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH] PM / Hibernate: Enable usermodehelpers in software_resume() error path
    Date
    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();
    >
    >
    >



    \
     
     \ /
      Last update: 2011-12-01 22:51    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean