patch-2.1.110 linux/arch/i386/kernel/setup.c

• Lines: 26
• Date: Sat Jul 18 13:43:05 1998
• Orig file: v2.1.109/linux/arch/i386/kernel/setup.c
• Orig date: Thu Jul 16 18:09:23 1998

diff -u --recursive --new-file v2.1.109/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -147,6 +147,13 @@
 			memory_end = memory_alt_end;
 	}
 #endif
+
+#define VMALLOC_RESERVE	(64 << 20)	/* 64MB for vmalloc */
+#define MAXMEM	((unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE))
+
+	if (memory_end > MAXMEM)
+		memory_end = MAXMEM;
+
 	memory_end &= PAGE_MASK;
 #ifdef CONFIG_BLK_DEV_RAM
 	rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
@@ -436,8 +443,9 @@
 	    NULL, "Pentium II (Deschutes)", NULL, NULL, NULL, NULL, NULL, NULL,
 	    NULL, NULL, NULL, NULL }},
 	{ X86_VENDOR_AMD,	4,
-	  { NULL, NULL, NULL, "DX/2", NULL, NULL, NULL, "DX/2-WB", "DX/4",
-	    "DX/4-WB", NULL, NULL, NULL, NULL, "Am5x86-WT", "Am5x86-WB" }},
+	  { NULL, NULL, NULL, "486 DX/2", NULL, NULL, NULL, "486 DX/2-WB",
+	    "486 DX/4", "486 DX/4-WB", NULL, NULL, NULL, NULL, "Am5x86-WT",
+	    "Am5x86-WB" }},
 	{ X86_VENDOR_AMD,	5,
 	  { "K5/SSA5 (PR75, PR90, PR100)", "K5 (PR120, PR133)",
 	    "K5 (PR166)", "K5 (PR200)", NULL, NULL,