From f2df1a5f499f8d559f66900b0e3b3fbf52f88d49 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Tue, 12 Aug 2003 21:59:26 -0700 Subject: [power] Various swsusp cleanups. - Move SMP check to software_suspend() (from software_resume()), so we will not even attempt to sleep with it enabled. - Make software_resume() a late initcall, removing the explicit call from prepare_namespace(). - Initialize software_suspend_enabled to 1, instead of doing it manually in software_resume(). - Don't explicitly initialzie resume_file. - Remove resume_status variable, as we can simply check for (non-) NULL resume_file string. - "noresume" setup function changed to simply zero first byte of resume_file string, simplifying logic. - Don't attempt to reset swap signature if noresume is specified. - Downstream function (bdev_write_page() wasn't implemented anyway, so we can just remove that also). If noresume is specified, there will still be a suspend image left on the swap partition. It may behoove us to never reset the swap signature, and always leave the image intact on the disk, since it is a valid snapshot that we can resume from at anytime. This unconditional behavior would force the user to add 'mkswap ' to their init scripts to reset the partition to swap use. IMO, this is better anyway. --- init/do_mounts.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'init') diff --git a/init/do_mounts.c b/init/do_mounts.c index f67ced75d3e1..1f6b3e575609 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -370,10 +370,6 @@ void __init prepare_namespace(void) is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR; - /* This has to be before mounting root, because even readonly mount of reiserfs would replay - log corrupting stuff */ - software_resume(); - if (initrd_load()) goto out; -- cgit v1.2.3