patch-2.4.0-test3 linux/arch/i386/kernel/apic.c

• Lines: 32
• Date: Mon Jul 10 14:20:49 2000
• Orig file: v2.4.0-test2/linux/arch/i386/kernel/apic.c
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test2/linux/arch/i386/kernel/apic.c linux/arch/i386/kernel/apic.c
@@ -5,8 +5,9 @@
  *
  *	Fixes
  *	Maciej W. Rozycki	:	Bits for genuine 82489DX APICs;
- *					thanks to Eric Gilmore for
- *					testing these extensively
+ *					thanks to Eric Gilmore
+ *					and Rolf G. Tews
+ *					for testing these extensively
  */
 
 #include <linux/config.h>
@@ -588,7 +589,7 @@
 			p->counter = 0;
 			p->need_resched = 1;
 		}
-		if (p->priority < DEF_PRIORITY) {
+		if (p->nice > 0) {
 			kstat.cpu_nice += user;
 			kstat.per_cpu_nice[cpu] += user;
 		} else {
@@ -597,7 +598,9 @@
 		}
 		kstat.cpu_system += system;
 		kstat.per_cpu_system[cpu] += system;
-
+	} else if (local_bh_count(cpu) || local_irq_count(cpu) > 1) {
+		kstat.cpu_system += system;
+		kstat.per_cpu_system[cpu] += system;
 	}
 	irq_exit(cpu, 0);
 }