The following commit has been merged into the perf/core branch of tip: Commit-ID: 1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574 Gitweb: https://git.kernel.org/tip/1af6239d1d3e61d33fd2f0ba53d3d1a67cc50574 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Wed, 16 Nov 2022 22:40:17 +01:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Thu, 24 Nov 2022 11:09:18 +01:00 perf: Fix function pointer case With the advent of CFI it is no longer acceptible to cast function pointers. The robot complains thusly: kernel-events-core.c:warning:cast-from-int-(-)(struct-perf_cpu_pmu_context-)-to-remote_function_f-(aka-int-(-)(void-)-)-converts-to-incompatible-function-type Reported-by: kernel test robot <lkp@xxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> --- kernel/events/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 5f262f9..f2b865c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -1119,6 +1119,11 @@ static int perf_mux_hrtimer_restart(struct perf_cpu_pmu_context *cpc) return 0; } +static int perf_mux_hrtimer_restart_ipi(void *arg) +{ + return perf_mux_hrtimer_restart(arg); +} + void perf_pmu_disable(struct pmu *pmu) { int *count = this_cpu_ptr(pmu->pmu_disable_count); @@ -11270,8 +11275,7 @@ perf_event_mux_interval_ms_store(struct device *dev, cpc = per_cpu_ptr(pmu->cpu_pmu_context, cpu); cpc->hrtimer_interval = ns_to_ktime(NSEC_PER_MSEC * timer); - cpu_function_call(cpu, - (remote_function_f)perf_mux_hrtimer_restart, cpc); + cpu_function_call(cpu, perf_mux_hrtimer_restart_ipi, cpc); } cpus_read_unlock(); mutex_unlock(&mux_interval_mutex);
![]() |