patch-2.3.99-pre1 linux/arch/i386/boot/tools/build.c

Next file: linux/arch/i386/config.in
Previous file: linux/arch/arm/vmlinux-armv.lds.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.51/linux/arch/i386/boot/tools/build.c linux/arch/i386/boot/tools/build.c
@@ -150,9 +150,13 @@
 	sz = sb.st_size;
 	fprintf (stderr, "System is %d kB\n", sz/1024);
 	sys_size = (sz + 15) / 16;
-	if (sys_size > (is_big_kernel ? 0xffff : DEF_SYSSIZE))
+	/* 0x28000*16 = 2.5 MB, conservative estimate for the current maximum */
+	if (sys_size > (is_big_kernel ? 0x28000 : DEF_SYSSIZE))
 		die("System is too big. Try using %smodules.",
 			is_big_kernel ? "" : "bzImage or ");
+	if (sys_size > 0xffff)
+		fprintf(stderr,"warning: kernel is too big for standalone boot "
+		    "from floppy\n");
 	while (sz > 0) {
 		int l, n;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)