From: James S. <jsi...@us...> - 2001-10-11 19:19:56
|
Update of /cvsroot/linux-mips/linux/arch/mips/mips-boards/generic In directory usw-pr-cvs1:/tmp/cvs-serv12205/mips/mips-boards/generic Modified Files: time.c Log Message: Fix load 1 problem. Index: time.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/mips-boards/generic/time.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- time.c 2001/10/05 17:07:14 1.2 +++ time.c 2001/10/11 19:19:52 1.3 @@ -133,13 +133,15 @@ */ void mips_timer_interrupt(struct pt_regs *regs) { + int cpu = smp_processor_id(); int irq = 7; if (r4k_offset == 0) goto null; + irq_enter(cpu, irq); do { - kstat.irqs[0][irq]++; + kstat.irqs[cpu][irq]++; do_timer(regs); /* Historical comment/code: @@ -172,6 +174,10 @@ } while (((unsigned long)read_32bit_cp0_register(CP0_COUNT) - r4k_cur) < 0x7fffffff); + irq_exit(cpu, irq); + + if (softirq_pending(cpu)) + do_softirq(); return; |