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

• Lines: 32
• Date: Thu Aug 17 07:33:26 1995
• Orig file: v1.3.20/linux/arch/i386/kernel/setup.c
• Orig date: Sun Aug 13 14:45:27 1995

diff -u --recursive --new-file v1.3.20/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -103,14 +103,24 @@
 	init_task.mm->brk = TASK_SIZE + (unsigned long) &_end;
 
 	for (;;) {
+		/*
+		 * "mem=nopentium" disables the 4MB page tables.
+		 * "mem=XXX[kKmM]" overrides the BIOS-reported
+		 * memory size
+		 */
 		if (c == ' ' && *(const unsigned long *)from == *(const unsigned long *)"mem=") {
-			memory_end = simple_strtoul(from+4, &from, 0);
-			if ( *from == 'K' || *from == 'k' ) {
-				memory_end = memory_end << 10;
-				from++;
-			} else if ( *from == 'M' || *from == 'm' ) {
-				memory_end = memory_end << 20;
-				from++;
+			if (!memcmp(from+4, "nopentium", 9)) {
+				from += 9+4;
+				x86_capability &= ~8;
+			} else {
+				memory_end = simple_strtoul(from+4, &from, 0);
+				if ( *from == 'K' || *from == 'k' ) {
+					memory_end = memory_end << 10;
+					from++;
+				} else if ( *from == 'M' || *from == 'm' ) {
+					memory_end = memory_end << 20;
+					from++;
+				}
 			}
 		}
 		c = *(from++);