From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 30 Jun 2010 09:37:20 +0000 (+0200)
Subject: Revert "Remove dead CONFIG_SIBYTE_BCM1480_PROF"
X-Git-Tag: v2.6.36-rc1~566^2~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=15676295e1189d87b9e5589549492c4f0ae46336;p=~shefty%2Frdma-dev.git

Revert "Remove dead CONFIG_SIBYTE_BCM1480_PROF"

This reverts commit 22c1d8b4f8f04882046ebe592f9a9eaea443cb45. It has
been nacked by MIPS maintainer Ralf Baechle.
---

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 919d2d58e6f..044bbe462c2 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -362,8 +362,19 @@ 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