---

yaml --- r: 305411 b: refs/heads/master c: ab7b64e h: refs/heads/master i: 305409: 35e13ac 305407: 41e60bf v: v3
git-mirror · May 16, 2012 · 31239fb · 31239fb
1 parent 6e0e3c0
commit 31239fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 363f7ce3250aafdaab43011c7dc40158ea571e6b
+refs/heads/master: ab7b64e9ee1e930ffe9d7f5b5eebe618a3b3a03b
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
@@ -393,10 +393,9 @@ static void __init reserve_initrd(void)
 	initrd_start = 0;
 
 	if (ramdisk_size >= (end_of_lowmem>>1)) {
-		memblock_free(ramdisk_image, ramdisk_end - ramdisk_image);
-		printk(KERN_ERR "initrd too large to handle, "
-		       "disabling initrd\n");
-		return;
+		panic("initrd too large to handle, "
+		       "disabling initrd (%lld needed, %lld available)\n",
+		       ramdisk_size, end_of_lowmem>>1);
 	}
 
 	printk(KERN_INFO "RAMDISK: %08llx - %08llx\n", ramdisk_image,