diff options
| author |   James Hogan <james.hogan@imgtec.com> | 2013-07-22 15:18:34 +0100 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2016-05-03 09:25:30 +0100 |
| commit | f5d163aad31e4ec30f7258e655503824a2b03d45 (patch) | |
| tree | 3676736b21b8b3b641dc837be9e937fcc2eb65bf /arch/metag | |
| parent | metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init (diff) | |
| download | linux-dev-f5d163aad31e4ec30f7258e655503824a2b03d45.tar.xz linux-dev-f5d163aad31e4ec30f7258e655503824a2b03d45.zip | |
metag: perf: fix build on Meta1
Meta1 doesn't support PERF_ICORE or PERF_CHAN registers resulting in
build errors due to missing definitions. Fix this with an ifdef matching
the one in asm/metag_mem.h.
The build errors (found by a randconfig):
arch/metag/kernel/perf/perf_event.c: In function 'metag_pmu_enable_counter':
arch/metag/kernel/perf/perf_event.c:639: error: 'PERF_ICORE0' undeclared (first use in this function)
arch/metag/kernel/perf/perf_event.c:639: error: (Each undeclared identifier is reported only once
arch/metag/kernel/perf/perf_event.c:639: error: for each function it appears in.)
arch/metag/kernel/perf/perf_event.c:643: error: 'PERF_CHAN0' undeclared (first use in this function)
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-metag@vger.kernel.org
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/kernel/perf/perf_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c index 2478ec6d23c9..33a365f924be 100644 --- a/arch/metag/kernel/perf/perf_event.c +++ b/arch/metag/kernel/perf/perf_event.c @@ -618,6 +618,8 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) /* Check for a core internal or performance channel event. */ if (tmp) { + /* PERF_ICORE/PERF_CHAN only exist since Meta2 */ +#ifdef METAC_2_1 void *perf_addr; /* @@ -640,6 +642,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) if (perf_addr) metag_out32((config & 0x0f), perf_addr); +#endif /* * Now we use the high nibble as the performance event to |