diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-05-22 11:01:43 +0300 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-05-22 11:01:43 +0300 |
commit | 2d8bdbf20a320dd7ccd03049500b03a63a86e772 (patch) | |
tree | f51aff05862a4112b9262b4c3d4105bd2b22f9e6 /init | |
parent | 94d4f89476643f867c5d96ed0fb2755f22fb3117 (diff) | |
parent | 6746136520cd0827320a83e62d0a023a5a433650 (diff) |
Merge branch 'topic/slab/fixes' into for-next
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 } |