From: "Al Cooper" <alcooperx@gmail.com>
To: ralf@linux-mips.org, linux-mips@linux-mips.org,
linux-kernel@vger.kernel.org
Cc: "Al Cooper" <alcooperx@gmail.com>
Subject: [PATCH 3/5] MIPS: perf: Remove unnecessary #ifdef
Date: Fri, 13 Jul 2012 16:44:52 -0400 [thread overview]
Message-ID: <1342212294-23014-3-git-send-email-alcooperx@gmail.com> (raw)
In-Reply-To: <1342212294-23014-1-git-send-email-alcooperx@gmail.com>
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>
---
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 4ee1111..19253d7 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)
--
1.7.6
next prev parent reply other threads:[~2012-07-13 20:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 20:44 [PATCH 1/5] MIPS: perf: Change the "mips_perf_event" table unsupported indicator Al Cooper
2012-07-13 20:44 ` [PATCH 2/5] MIPS: perf: Add cpu feature bit for PCI (performance counter interrupt) Al Cooper
2012-07-13 20:44 ` Al Cooper [this message]
2012-07-13 20:44 ` [PATCH 4/5] MIPS: perf: Split the Kconfig option CONFIG_MIPS_MT_SMP Al Cooper
2012-07-13 20:44 ` [PATCH 5/5] MIPS: perf: Add perf functionality for BMIPS5000 Al Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342212294-23014-3-git-send-email-alcooperx@gmail.com \
--to=alcooperx@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome