diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-14 10:52:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-14 10:52:23 -0700 |
| commit | 9508edb015641bb885ae918db2a6b84ed8f2b615 (patch) | |
| tree | 3d8335acfc5a3552f1b1923c588b37a8ecbd8b11 /init | |
| parent | 7490aafb582ea5274d756bce74877814dca7cf07 (diff) | |
| parent | fcab304b5df5bf6188d9addc340d78f1a153ea2d (diff) | |
Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 41a5934d09a9..63066472d568 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -385,10 +385,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; |