Skip to contentSkip to conversation

powerpc/perf: Fix power_pmu_wants_prompt_pmi to be defined only for CONFIG_PPC64

PATCH Applied Athira Rajeev 2 participants 2 messages Jan 14, 2022 – Jan 19, 2022 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/perf: Fix power_pmu_wants_prompt_pmi to be defined only for CONFIG_PPC64

power_pmu_wants_prompt_pmi is used to decide if PMI should be taken prompt. This is valid only for ppc64 and is used in CONFIG_PPC_BOOK3S_64 context. Hence include the function under config check for PPC64

Fixes warning for 32-bit compilation:

Quoted 1 line
Quoted 1 line

arch/powerpc/perf/core-book3s.c:2455:6: warning: no previous prototype for 'power_pmu_wants_prompt_pmi' [-Wmissing-prototypes]

2455 | bool power_pmu_wants_prompt_pmi(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes 5a7745b96f43 ("powerpc/64s/perf: add power_pmu_wants_prompt_pmi to say whether perf wants PMIs to be soft-NMI")

---
Note: Address compilation warning reported here:
https://lore.kernel.org/lkml/[email protected]/
Patch is based on powerpc/merge

 arch/powerpc/perf/core-book3s.c | 2 ++
 1 file changed, 2 insertions(+)
arch/powerpc/perf/core-book3s.c +2 -0
index a684901b6965..b7160fae58c6 100644
@@ -2452,6 +2452,7 @@ static void perf_event_interrupt(struct pt_regs *regs)
  * could possibly return false if only events are being counted rather than
  * samples being taken, but for now this is good enough.
  */
+#ifdef CONFIG_PPC64
 bool power_pmu_wants_prompt_pmi(void)
 {
 	struct cpu_hw_events *cpuhw;
@@ -2467,6 +2468,7 @@ bool power_pmu_wants_prompt_pmi(void)
 	cpuhw = this_cpu_ptr(&cpu_hw_events);
 	return cpuhw->n_events;
 }
+#endif
 
 static int power_pmu_prepare_cpu(unsigned int cpu)
 {
Signature · 1 line
2.33.0
#1 lore raw
Quoted 8 lines · Athira Rajeev

power_pmu_wants_prompt_pmi is used to decide if PMI should be taken prompt. This is valid only for ppc64 and is used in CONFIG_PPC_BOOK3S_64 context. Hence include the function under config check for PPC64

Fixes warning for 32-bit compilation:

[...]

Applied to powerpc/fixes.

[1/1] powerpc/perf: Fix power_pmu_wants_prompt_pmi to be defined only for CONFIG_PPC64

      https://git.kernel.org/powerpc/c/429a64f6e91fbfe4912d17247c27d0d66767b1c2

cheers