diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-28 12:18:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-28 12:18:03 +1000 |
| commit | cd276e38e8d70fecb027fdcb96075a793dc6fc36 (patch) | |
| tree | 97e036a01c2c2b8e54c30ed9fbb89c3b7828f1d9 /arch/mips | |
| parent | 22d57cb15e6116c1a635954f1516044770eb91f1 (diff) | |
| parent | bd06cac82c2af96f2e64a0e994e11bfe41b77e8d (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/sibyte/bcm1480/irq.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 044bbe462c2c..919d2d58e6fa 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c @@ -362,19 +362,8 @@ asmlinkage void plat_irq_dispatch(void) unsigned int cpu = smp_processor_id(); unsigned int pending; -#ifdef CONFIG_SIBYTE_BCM1480_PROF - /* Set compare to count to silence count/compare timer interrupts */ - write_c0_compare(read_c0_count()); -#endif - pending = read_c0_cause() & read_c0_status(); -#ifdef CONFIG_SIBYTE_BCM1480_PROF - if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */ - sbprof_cpu_intr(); - else -#endif - if (pending & CAUSEF_IP4) do_IRQ(K_BCM1480_INT_TIMER_0 + cpu); #ifdef CONFIG_SMP |