From 360c6a541280aa18bb15ad845d9a38e6be92fb45 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 26 Jun 2006 13:56:25 +0200 Subject: [PATCH] --- yaml --- r: 30455 b: refs/heads/master c: 3c5846470c30580bbcb4d5f2339f75a2c88cfe6e h: refs/heads/master i: 30453: d28e7b6cbb10d38d575edae596d8ab7a747dcb3e 30451: 9f2746994faf01c0840a667be9027d0bd686d50d 30447: 585a59531e48f555bc228a6d3a8cb691d532d857 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/boot/tools/build.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a22448a3328f..cd6801ff831a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c90bb87730613709e65c03c86d614e31a675d4f +refs/heads/master: 3c5846470c30580bbcb4d5f2339f75a2c88cfe6e diff --git a/trunk/arch/x86_64/boot/tools/build.c b/trunk/arch/x86_64/boot/tools/build.c index c44f5e2ec100..eae86691709a 100644 --- a/trunk/arch/x86_64/boot/tools/build.c +++ b/trunk/arch/x86_64/boot/tools/build.c @@ -149,10 +149,8 @@ int main(int argc, char ** argv) sz = sb.st_size; fprintf (stderr, "System is %d kB\n", sz/1024); sys_size = (sz + 15) / 16; - /* 0x40000*16 = 4.0 MB, reasonable estimate for the current maximum */ - if (sys_size > (is_big_kernel ? 0x40000 : DEF_SYSSIZE)) - die("System is too big. Try using %smodules.", - is_big_kernel ? "" : "bzImage or "); + if (!is_big_kernel && sys_size > DEF_SYSSIZE) + die("System is too big. Try using bzImage or modules."); while (sz > 0) { int l, n;