patch-2.4.0-prerelease linux/arch/i386/kernel/setup.c

• Lines: 56
• Date: Sun Dec 31 10:26:18 2000
• Orig file: v2.4.0-test12/linux/arch/i386/kernel/setup.c
• Orig date: Mon Dec 11 17:59:43 2000

diff -u --recursive --new-file v2.4.0-test12/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -477,7 +477,7 @@
 			if (start < 0x100000ULL && end > 0xA0000ULL) {
 				if (start < 0xA0000ULL)
 					add_memory_region(start, 0xA0000ULL-start, type);
-				if (end < 0x100000ULL)
+				if (end <= 0x100000ULL)
 					continue;
 				start = 0x100000ULL;
 				size = end - start;
@@ -518,7 +518,7 @@
 
 		e820.nr_map = 0;
 		add_memory_region(0, LOWMEMSIZE(), E820_RAM);
-		add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM);
+		add_memory_region(HIGH_MEMORY, (mem_size << 10) - HIGH_MEMORY, E820_RAM);
   	}
 	printk("BIOS-provided physical RAM map:\n");
 	print_memory_map(who);
@@ -1149,7 +1149,7 @@
 		if (ccr5 & 2) { /* possible wrong calibration done */
 			printk(KERN_INFO "Recalibrating delay loop with SLOP bit reset\n");
 			calibrate_delay();
-			c->loops_per_sec = loops_per_sec;
+			c->loops_per_jiffy = loops_per_jiffy;
 		}
 	}
 }
@@ -1553,7 +1553,7 @@
 						/* L1 D cache */
 						l1d += 16;
 						break;
-					default:
+					default:;
 						/* TLB, or unknown */
 					}
 					break;
@@ -1884,7 +1884,7 @@
 	int junk, i;
 	u32 xlvl, tfms;
 
-	c->loops_per_sec = loops_per_sec;
+	c->loops_per_jiffy = loops_per_jiffy;
 	c->x86_cache_size = -1;
 	c->x86_vendor = X86_VENDOR_UNKNOWN;
 	c->cpuid_level = -1;	/* CPUID not detected */
@@ -2188,8 +2188,8 @@
 				p += sprintf(p, " %s", x86_cap_flags[i]);
 
 		p += sprintf(p, "\nbogomips\t: %lu.%02lu\n\n",
-			(c->loops_per_sec+2500)/500000,
-			((c->loops_per_sec+2500)/5000) % 100);
+			     c->loops_per_jiffy/(500000/HZ),
+			     (c->loops_per_jiffy/(5000/HZ)) % 100);
 	}
 	return p - buffer;
 }