summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorWu Zhangjin <wuzhangjin@gmail.com>2010-04-26 20:01:54 +0800
committerRalf Baechle <ralf@linux-mips.org>2010-04-30 20:52:54 +0100
commit922010ff7b75737e6dc361f8eae9c2784ac1872d (patch)
tree800fb92ec4b1a6a0a02544cd2c67a77a795c215c /arch/mips
parent9dd147467790932e2f630b67eec925745463ee11 (diff)
downloadop-kernel-dev-922010ff7b75737e6dc361f8eae9c2784ac1872d.zip
op-kernel-dev-922010ff7b75737e6dc361f8eae9c2784ac1872d.tar.gz
MIPS: oprofile: Fix breakage when CONFIG_OPROFILE=m
When the oprofile is compiled as a module do_IRQ() is not called in arch/mips/loongson/lemote-2f/irq.c due to a wrong #ifdef there. Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1143/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/loongson/lemote-2f/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson/lemote-2f/irq.c b/arch/mips/loongson/lemote-2f/irq.c
index 882dfcd4..1d8b4d2 100644
--- a/arch/mips/loongson/lemote-2f/irq.c
+++ b/arch/mips/loongson/lemote-2f/irq.c
@@ -79,7 +79,7 @@ void mach_irq_dispatch(unsigned int pending)
if (pending & CAUSEF_IP7)
do_IRQ(LOONGSON_TIMER_IRQ);
else if (pending & CAUSEF_IP6) { /* North Bridge, Perf counter */
-#ifdef CONFIG_OPROFILE
+#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
do_IRQ(LOONGSON2_PERFCNT_IRQ);
#endif
bonito_irqdispatch();
OpenPOWER on IntegriCloud