Commit ecb8ee8a authored Jul 13, 2012 by Al Cooper Committed by Ralf Baechle Oct 11, 2012

MIPS: perf: Remove unnecessary #ifdef



The #ifdef for CONFIG_HW_PERF_EVENTS is not needed because the
Makefile will only compile the module if this config option is set.
This means that the code under #else would never be compiled. This
may have been done to leave the original broken code around for
reference, but the FIXME comment above the code already shows the
broken code.

Signed-off-by: Al Cooper <alcooperx@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/4107/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent da4b62cd

arch/mips/kernel/perf_event_mipsxx.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -139,13 +139,8 @@ static DEFINE_RWLOCK(pmuint_rwlock);
		* FIXME: For VSMP, vpe_id() is redefined for Perf-events, because
		* cpu_data[cpuid].vpe_id reports 0 for _both_ CPUs.
		*/
		#if defined(CONFIG_HW_PERF_EVENTS)
		#define vpe_id() (cpu_has_mipsmt_pertccounters ? \
		0 : smp_processor_id())
		#else
		#define vpe_id() (cpu_has_mipsmt_pertccounters ? \
		0 : cpu_data[smp_processor_id()].vpe_id)
		#endif

		/* Copied from op_model_mipsxx.c */
		static unsigned int vpe_shift(void)