diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 16:25:59 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 16:25:59 +0200 |
| commit | 30beab1491f0b96b2f23d3fb68af01fd921a16d8 (patch) | |
| tree | c580bdc0846269fbb10feeda901ecec1a48ee2ef /kernel/power/disk.c | |
| parent | AUDIT: Really don't audit auditd. (diff) | |
| parent | Linux 2.6.13-rc3 (diff) | |
| download | linux-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.xz linux-30beab1491f0b96b2f23d3fb68af01fd921a16d8.zip | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index fb8de63c2919..3ec789c6b537 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -16,6 +16,8 @@ #include <linux/device.h> #include <linux/delay.h> #include <linux/fs.h> +#include <linux/mount.h> + #include "power.h" @@ -234,6 +236,16 @@ static int software_resume(void) { int error; + if (!swsusp_resume_device) { + if (!strlen(resume_file)) + return -ENOENT; + swsusp_resume_device = name_to_dev_t(resume_file); + pr_debug("swsusp: Resume From Partition %s\n", resume_file); + } else { + pr_debug("swsusp: Resume From Partition %d:%d\n", + MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device)); + } + if (noresume) { /** * FIXME: If noresume is specified, we need to find the partition |