Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137055
b: refs/heads/master
c: 73310a1
h: refs/heads/master
i:
  137053: ca7567d
  137051: d9c0d57
  137047: 7c33c45
  137039: 8b32afa
  137023: 83e284b
v: v3
  • Loading branch information
H. Peter Anvin committed Jan 14, 2009
1 parent 8339077 commit c6cb075
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23a22d57a8962479ca630c9542e62d6f86fdf927
refs/heads/master: 73310a169aebe257efdd35a763cce1c7658f40c9
3 changes: 2 additions & 1 deletion trunk/init/do_mounts_rd.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n",
compress_name, start_block);
if (!*decompressor)
printk(KERN_CRIT "RAMDISK: %s decompressor not configured!\n",
printk(KERN_EMERG
"RAMDISK: %s decompressor not configured!\n",
compress_name);
nblocks = 0;
goto done;
Expand Down
11 changes: 7 additions & 4 deletions trunk/init/initramfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ static int __init populate_rootfs(void)
char *err = unpack_to_rootfs(__initramfs_start,
__initramfs_end - __initramfs_start, 0);
if (err)
panic(err);
panic(err); /* Failed to decompress INTERNAL initramfs */
if (initrd_start) {
#ifdef CONFIG_BLK_DEV_RAM
int fd;
Expand All @@ -554,9 +554,12 @@ static int __init populate_rootfs(void)
printk(KERN_INFO "Unpacking initramfs...");
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start, 0);
if (err)
panic(err);
printk(" done\n");
if (err) {
printk(" failed!\n");
printk(KERN_EMERG "%s\n", err);
} else {
printk(" done\n");
}
free_initrd();
#endif
}
Expand Down

0 comments on commit c6cb075

Please sign in to comment.