diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 09:37:44 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 09:37:49 +0400 |
| commit | dc3f81b129b5439ba7bac265bbc6a51a39275dae (patch) | |
| tree | 216030731d911249496d2e97206cd61431e31c89 /init | |
| parent | d2517a49d55536b38c7a87e5289550cfedaa4dcc (diff) | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
| download | linux-dc3f81b129b5439ba7bac265bbc6a51a39275dae.tar.xz | |
Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 9ee7b7810417..4c00edc59689 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -574,11 +574,10 @@ static int __init populate_rootfs(void) if (initrd_start) { #ifdef CONFIG_BLK_DEV_RAM int fd; - printk(KERN_INFO "checking if image is initramfs...\n"); + printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n"); err = unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start); if (!err) { - printk(KERN_INFO "rootfs image is initramfs; unpacking...\n"); free_initrd(); return 0; } else { @@ -596,15 +595,11 @@ static int __init populate_rootfs(void) free_initrd(); } #else - printk(KERN_INFO "Unpacking initramfs..."); + printk(KERN_INFO "Unpacking initramfs...\n"); err = unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start); - if (err) { - printk(" failed!\n"); - printk(KERN_EMERG "%s\n", err); - } else { - printk(" done\n"); - } + if (err) + printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); free_initrd(); #endif } |