[MIPS] Random fixes for sb1250
authorThiemo Seufer <ths@networkno.de>
Sun, 18 Jun 2006 04:23:47 +0000 (05:23 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 19 Jun 2006 16:39:24 +0000 (17:39 +0100)
Random improvements for sb1250: Silence compiler warnings, a bugfix for
the profiling code, and a comment typo.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/sibyte/sb1250/irq.c

index 0f6e54db4888869c35d639fdc9963a602e62ad8c..f853c32f60a0f7e1b847f289a469b8e2b0932ada 100644 (file)
@@ -435,13 +435,17 @@ static inline int dclz(unsigned long long x)
        return lz;
 }
 
+extern void sb1250_timer_interrupt(struct pt_regs *regs);
+extern void sb1250_mailbox_interrupt(struct pt_regs *regs);
+extern void sb1250_kgdb_interrupt(struct pt_regs *regs);
+
 asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
 {
        unsigned int pending;
 
 #ifdef CONFIG_SIBYTE_SB1250_PROF
        /* Set compare to count to silence count/compare timer interrupts */
-       write_c0_count(read_c0_count());
+       write_c0_compare(read_c0_count());
 #endif
 
        /*
@@ -482,7 +486,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
                 * Default...we've hit an IP[2] interrupt, which means we've
                 * got to check the 1250 interrupt registers to figure out what
                 * to do.  Need to detect which CPU we're on, now that
-                ~ smp_affinity is supported.
+                * smp_affinity is supported.
                 */
                mask = __raw_readq(IOADDR(A_IMR_REGISTER(smp_processor_id(),
                                              R_IMR_INTERRUPT_STATUS_BASE)));