diff options
Diffstat (limited to 'init/initramfs.c')
-rw-r--r-- | init/initramfs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 9a7290ec8187..7dcde7ea6603 100644 --- a/init/initramfs.c +++ b/init/initramfs.c | |||
@@ -528,7 +528,7 @@ static int __init populate_rootfs(void) | |||
528 | char *err = unpack_to_rootfs(__initramfs_start, | 528 | char *err = unpack_to_rootfs(__initramfs_start, |
529 | __initramfs_end - __initramfs_start, 0); | 529 | __initramfs_end - __initramfs_start, 0); |
530 | if (err) | 530 | if (err) |
531 | panic(err); | 531 | panic(err); /* Failed to decompress INTERNAL initramfs */ |
532 | if (initrd_start) { | 532 | if (initrd_start) { |
533 | #ifdef CONFIG_BLK_DEV_RAM | 533 | #ifdef CONFIG_BLK_DEV_RAM |
534 | int fd; | 534 | int fd; |
@@ -554,9 +554,12 @@ static int __init populate_rootfs(void) | |||
554 | printk(KERN_INFO "Unpacking initramfs..."); | 554 | printk(KERN_INFO "Unpacking initramfs..."); |
555 | err = unpack_to_rootfs((char *)initrd_start, | 555 | err = unpack_to_rootfs((char *)initrd_start, |
556 | initrd_end - initrd_start, 0); | 556 | initrd_end - initrd_start, 0); |
557 | if (err) | 557 | if (err) { |
558 | panic(err); | 558 | printk(" failed!\n"); |
559 | printk(" done\n"); | 559 | printk(KERN_EMERG "%s\n", err); |
560 | } else { | ||
561 | printk(" done\n"); | ||
562 | } | ||
560 | free_initrd(); | 563 | free_initrd(); |
561 | #endif | 564 | #endif |
562 | } | 565 | } |