Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eca5b14 authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

MIPS: Remove redundant IPTI==IPPCI logic 



The situation where the timer interrupt is on the same line as the
performance counter interrupt is handled in per_cpu_trap_init() by
setting cp0_perfcount_irq to -1, so there is no need to duplicate the
logic conditional upon cp0_perfcount_irq >= 0 in perf
(init_hw_perf_events()) and oprofile (mipsxx_init()).

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/9125/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3ba5040a

arch/mips/kernel/perf_event_mipsxx.c

+1 −2
Original line number Diff line number Diff line
@@ -1615,8 +1615,7 @@ init_hw_perf_events(void) 


	if (get_c0_perfcount_int)

		irq = get_c0_perfcount_int();

	else if ((cp0_perfcount_irq >= 0) &&

		 (cp0_compare_irq != cp0_perfcount_irq))

	else if (cp0_perfcount_irq >= 0)

		irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;

	else

		irq = -1;

arch/mips/oprofile/op_model_mipsxx.c

+1 −2
Original line number Diff line number Diff line
@@ -435,8 +435,7 @@ static int __init mipsxx_init(void) 


	if (get_c0_perfcount_int)

		perfcount_irq = get_c0_perfcount_int();

	else if ((cp0_perfcount_irq >= 0) &&

		 (cp0_compare_irq != cp0_perfcount_irq))

	else if (cp0_perfcount_irq >= 0)

		perfcount_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;

	else

		perfcount_irq = -1;