patch-2.1.57 linux/arch/i386/boot/compressed/misc.c

• Lines: 31
• Date: Sat Sep 20 15:20:35 1997
• Orig file: v2.1.56/linux/arch/i386/boot/compressed/misc.c
• Orig date: Wed Apr 16 14:14:59 1997

diff -u --recursive --new-file v2.1.56/linux/arch/i386/boot/compressed/misc.c linux/arch/i386/boot/compressed/misc.c
@@ -75,6 +75,9 @@
  * This is set up by the setup-routine at boot-time
  */
 #define EXT_MEM_K (*(unsigned short *)0x90002)
+#ifndef STANDARD_MEMORY_BIOS_CALL
+#define ALT_MEM_K (*(unsigned long *) 0x901e0)
+#endif
 #define SCREEN_INFO (*(struct screen_info *)0x90000)
 
 extern char input_data[];
@@ -287,9 +290,9 @@
 void setup_normal_output_buffer()
 {
 #ifdef STANDARD_MEMORY_BIOS_CALL
-	if (EXT_MEM_K < 1024) error("<2M of mem\n");
+	if (EXT_MEM_K < 1024) error("Less than 2MB of memory.\n");
 #else
-	if (EXT_MEM_K*64 < 1024) error("<2M of mem\n");
+	if ((ALT_MEM_K > EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) < 1024) error("Less than 2MB of memory.\n");
 #endif
 	output_data = (char *)0x100000; /* Points to 1M */
 }
@@ -305,7 +308,7 @@
 #ifdef STANDARD_MEMORY_BIOS_CALL
 	if (EXT_MEM_K < (3*1024)) error("Less than 4MB of memory.\n");
 #else
-	if (EXT_MEM_K*64 < (3*1024)) error("Less than 4MB of memory.\n");
+	if ((ALT_MEM_K > EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) < (3*1024)) error("Less than 4MB of memory.\n");
 #endif	
 	mv->low_buffer_start = output_data = (char *)LOW_BUFFER_START;
 	high_loaded = 1;