lkml.org 
[lkml]   [2009]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] resume: wait for device probing to finish
    (this patch needs testing on a few different machines; compile tested only)


    From 10b3e25671c817933e232498a56640fd48964345 Mon Sep 17 00:00:00 2001
    From: Arjan van de Ven <arjan@linux.intel.com>
    Date: Fri, 9 Jan 2009 21:11:23 -0800
    Subject: [PATCH] resume: wait for device probing to finish

    the resume code does not currently wait for device probing to finish.
    Even without async function calls this is dicey and not correct,
    but with async function calls during the boot sequence this is going
    to get hit more...

    This patch adds the synchronization using the newly introduced helper.

    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    ---
    kernel/power/disk.c | 11 +++++++++++
    1 files changed, 11 insertions(+), 0 deletions(-)

    diff --git a/kernel/power/disk.c b/kernel/power/disk.c
    index 45e8541..d2d24b7 100644
    --- a/kernel/power/disk.c
    +++ b/kernel/power/disk.c
    @@ -585,6 +585,12 @@ static int software_resume(void)
    unsigned int flags;

    /*
    + * If the user said "noresume".. bail out early.
    + */
    + if (noresume)
    + return 0;
    +
    + /*
    * name_to_dev_t() below takes a sysfs buffer mutex when sysfs
    * is configured into the kernel. Since the regular hibernate
    * trigger path is via sysfs which takes a buffer mutex before
    @@ -600,6 +606,11 @@ static int software_resume(void)
    mutex_unlock(&pm_mutex);
    return -ENOENT;
    }
    + /*
    + * Some device discovery might still be in progress; we need
    + * to wait for this to finish.
    + */
    + wait_for_device_probe();
    swsusp_resume_device = name_to_dev_t(resume_file);
    pr_debug("PM: Resume from partition %s\n", resume_file);
    } else {
    --
    1.6.0.6


    --
    Arjan van de Ven Intel Open Source Technology Centre
    For development, discussion and tips for power savings,
    visit http://www.lesswatts.org


    \
     
     \ /
      Last update: 2009-01-10 06:15    [W:0.024 / U:59.472 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site