aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@osdl.org>2003-08-14 00:40:55 -0700
committerPatrick Mochel <mochel@osdl.org>2003-08-14 00:40:55 -0700
commitbee60089075ef59a0e997148e43069aa3df8e227 (patch)
treebca1e0067bc9e66a48c1d0f51f4f02f030490a16 /init
parent310b411f7f1ac37de5c8b9db5edd8b436b4b5eba (diff)
parent0b081c819fa9419fb6e027772f08dccac1f8ea8a (diff)
downloadhistory-bee60089075ef59a0e997148e43069aa3df8e227.tar.gz
Hand Merge
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 9d7e30252c465b..7ede163e26ba3d 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -373,10 +373,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;