lkml.org 
[lkml]   [2007]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm] swsusp: Use reasonable default for hibernation_mode
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Make sure that hibernation_mode is set to a reasonable value by default.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    ---
    kernel/power/disk.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    Index: linux-2.6.21/kernel/power/disk.c
    ===================================================================
    --- linux-2.6.21.orig/kernel/power/disk.c 2007-05-06 14:40:12.000000000 +0200
    +++ linux-2.6.21/kernel/power/disk.c 2007-05-08 22:12:02.000000000 +0200
    @@ -30,8 +30,6 @@ char resume_file[256] = CONFIG_PM_STD_PA
    dev_t swsusp_resume_device;
    sector_t swsusp_resume_block;

    -static int hibernation_mode;
    -
    enum {
    HIBERNATION_INVALID,
    HIBERNATION_PLATFORM,
    @@ -45,6 +43,8 @@ enum {
    #define HIBERNATION_MAX (__HIBERNATION_AFTER_LAST-1)
    #define HIBERNATION_FIRST (HIBERNATION_INVALID + 1)

    +static int hibernation_mode = HIBERNATION_SHUTDOWN;
    +
    struct hibernation_ops *hibernation_ops;

    /**
    @@ -60,6 +60,11 @@ void hibernation_set_ops(struct hibernat
    }
    mutex_lock(&pm_mutex);
    hibernation_ops = ops;
    + if (ops)
    + hibernation_mode = HIBERNATION_PLATFORM;
    + else if (hibernation_mode == HIBERNATION_PLATFORM)
    + hibernation_mode = HIBERNATION_SHUTDOWN;
    +
    mutex_unlock(&pm_mutex);
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-05-08 22:45    [W:0.021 / U:58.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site