From 31239fbcb512d9f6fe2dda247444693070070d0d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 May 2012 13:43:26 -0400 Subject: [PATCH] --- yaml --- r: 305411 b: refs/heads/master c: ab7b64e9ee1e930ffe9d7f5b5eebe618a3b3a03b h: refs/heads/master i: 305409: 35e13ac83bd4e5b1af0acef5db80ff93bcf0a3b2 305407: 41e60bf5518ac088a48e5450ed001cdb5514f443 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c2c4f931878d..8edc5e6a2f04 100644 --- 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 index 1a2901562059..37ef1169ffde 100644 --- 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,