summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-09-24 03:27:22 -0700
committerPatrick Mochel <mochel@digitalimplant.org>2004-09-24 03:27:22 -0700
commita0eb3a4091315209f2cd2583b1fc8ab03988687b (patch)
tree1fdfcbb2bedb19c6c466d38f505e3c5e078a6a9f /kernel
parent58981827b9ac3b429685bd6a139e25a02290b795 (diff)
[PATCH] -mm swsusp: make sure we do not return to userspace where image is on disk
From: Pavel Machek <pavel@ucw.cz> When image is already on the disk, returning back to user is dangerous. Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/disk.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index f09de7ad0eff..1af45900f61f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -63,8 +63,10 @@ static int power_down(u32 mode)
break;
}
machine_halt();
- device_power_up();
- local_irq_restore(flags);
+ /* Valid image is on the disk, if we continue we risk serious data corruption
+ after resume. */
+ printk("Please power me down manually\n");
+ while(1);
return 0;
}