From c6cb075cb88e3e2b1682df83f8355df82d6e92e6 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Wed, 14 Jan 2009 11:28:35 -0800
Subject: [PATCH] --- yaml --- r: 137055 b: refs/heads/master c:
 73310a169aebe257efdd35a763cce1c7658f40c9 h: refs/heads/master i:   137053:
 ca7567d44f3564b26056ae9be93f567e20959675   137051:
 d9c0d57175fa68a01d11437a8fd0e2eb81e4ee32   137047:
 7c33c4527b237fd2bec99ac244db0148a54bfee9   137039:
 8b32afa4db86934262f2ab0013169a7c0f20c191   137023:
 83e284b39f4fe0024dcc1d17a985c0c6f0d7bcb0 v: v3

---
 [refs]                    |  2 +-
 trunk/init/do_mounts_rd.c |  3 ++-
 trunk/init/initramfs.c    | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7540191ccfcf..977ab55716bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23a22d57a8962479ca630c9542e62d6f86fdf927
+refs/heads/master: 73310a169aebe257efdd35a763cce1c7658f40c9
diff --git a/trunk/init/do_mounts_rd.c b/trunk/init/do_mounts_rd.c
index 91d0cfca5071..027a402708de 100644
--- a/trunk/init/do_mounts_rd.c
+++ b/trunk/init/do_mounts_rd.c
@@ -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;
diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c
index 9a7290ec8187..7dcde7ea6603 100644
--- a/trunk/init/initramfs.c
+++ b/trunk/init/initramfs.c
@@ -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;
@@ -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
 	}