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

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

diff -u --recursive --new-file v2.4.0-test12/linux/arch/i386/kernel/smpboot.c linux/arch/i386/kernel/smpboot.c
@@ -694,6 +694,11 @@
 		apic_write_around(APIC_ICR, APIC_DM_STARTUP
 					| (start_eip >> 12));
 
+		/*
+		 * Give the other CPU some time to accept the IPI.
+		 */
+		udelay(300);
+
 		Dprintk("Startup point 1.\n");
 
 		Dprintk("Waiting for send to finish...\n");
@@ -979,11 +984,11 @@
 		unsigned long bogosum = 0;
 		for (cpu = 0; cpu < NR_CPUS; cpu++)
 			if (cpu_online_map & (1<<cpu))
-				bogosum += cpu_data[cpu].loops_per_sec;
+				bogosum += cpu_data[cpu].loops_per_jiffy;
 		printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
 			cpucount+1,
-			(bogosum+2500)/500000,
-			((bogosum+2500)/5000)%100);
+			bogosum/(500000/HZ),
+			(bogosum/(5000/HZ))%100);
 		Dprintk("Before bogocount - setting activated=1.\n");
 	}
 	smp_num_cpus = cpucount + 1;