patch-2.4.0-test6 linux/arch/mips/sgi/kernel/setup.c

• Lines: 44
• Date: Wed Aug 9 13:46:02 2000
• Orig file: v2.4.0-test5/linux/arch/mips/sgi/kernel/setup.c
• Orig date: Mon Jul 10 16:47:19 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/mips/sgi/kernel/setup.c linux/arch/mips/sgi/kernel/setup.c
@@ -130,9 +130,9 @@
 
 int __init page_is_ram(unsigned long pagenr)
 {
-	if (pagenr < MAP_NR(PAGE_OFFSET + 0x2000UL))
+	if ((pagenr<<PAGE_SHIFT) < 0x2000UL)
 		return 1;
-	if (pagenr > MAP_NR(PAGE_OFFSET + 0x08002000))
+	if ((pagenr<<PAGE_SHIFT) > 0x08002000)
 		return 1;
 	return 0;
 }
@@ -180,7 +180,7 @@
 	 */
         struct sgi_ioc_timers *p;
         volatile unsigned char *tcwp, *tc2p;
-	unsigned long r4k_ticks[3];
+	unsigned long r4k_ticks[3] = { 0, 0, 0 };
 	unsigned long r4k_next;
 
         /* Figure out the r4k offset, the algorithm is very simple
@@ -198,15 +198,16 @@
         tc2p = &p->tcnt2;
 
         printk("Calibrating system timer... ");
-        dosample(tcwp, tc2p);                   /* First sample. */
-        dosample(tcwp, tc2p);                   /* Eat one.     */
-        r4k_ticks[0] = dosample(tcwp, tc2p);      /* Second sample. */
-	dosample(tcwp, tc2p);			/* Eat another. */
-	r4k_ticks[1] += dosample (tcwp, tc2p);	/* Third sample. */
+        dosample(tcwp, tc2p);                   /* Prime cache. */
+        dosample(tcwp, tc2p);                   /* Prime cache. */
+	/* Zero is NOT an option. */
+	while (!r4k_ticks[0])
+		r4k_ticks[0] = dosample (tcwp, tc2p);
+	while (!r4k_ticks[1])
+		r4k_ticks[1] = dosample (tcwp, tc2p);
 
 	if (r4k_ticks[0] != r4k_ticks[1]) {
 		printk ("warning: timer counts differ, retrying...");
-		dosample (tcwp, tc2p);
 		r4k_ticks[2] = dosample (tcwp, tc2p);
 		if (r4k_ticks[2] == r4k_ticks[0] 
 		    || r4k_ticks[2] == r4k_ticks[1])