diff options
| author | Al Cooper <alcooperx@gmail.com> | 2012-07-13 16:44:52 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-10-11 11:04:34 +0200 |
| commit | ecb8ee8a8987368491bd0dab34353c724654ec55 (patch) | |
| tree | 8f9c788a0ffbf61f4800d82b50d64cdc68f49e4f | |
| parent | da4b62cd6762ce327f660c6e45c8d5a739197159 (diff) | |
| download | linux-stable-ecb8ee8a8987368491bd0dab34353c724654ec55.tar.gz linux-stable-ecb8ee8a8987368491bd0dab34353c724654ec55.tar.bz2 linux-stable-ecb8ee8a8987368491bd0dab34353c724654ec55.zip | |
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>
| -rw-r--r-- | arch/mips/kernel/perf_event_mipsxx.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index 4ee111142aad..19253d7ca730 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -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) |