From: Tomas Glozar <tglozar@xxxxxxxxxx> This reverts commit 83b74901bdc9b58739193b8ee6989254391b6ba7. The commit breaks rtla build, since params->kernel_workload is not present on 6.6-stable. Signed-off-by: Tomas Glozar <tglozar@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/tracing/rtla/src/timerlat_hist.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -900,15 +900,12 @@ timerlat_hist_apply_config(struct osnois auto_house_keeping(¶ms->monitored_cpus); } - /* - * Set workload according to type of thread if the kernel supports it. - * On kernels without support, user threads will have already failed - * on missing timerlat_fd, and kernel threads do not need it. - */ - retval = osnoise_set_workload(tool->context, params->kernel_workload); - if (retval < -1) { - err_msg("Failed to set OSNOISE_WORKLOAD option\n"); - goto out_err; + if (params->user_hist) { + retval = osnoise_set_workload(tool->context, 0); + if (retval) { + err_msg("Failed to set OSNOISE_WORKLOAD option\n"); + goto out_err; + } } return 0; Patches currently in stable-queue which might be from tglozar@xxxxxxxxxx are queue-6.6/revert-rtla-timerlat_top-set-osnoise_workload-for-kernel-threads.patch queue-6.6/rtla-timerlat_top-set-osnoise_workload-for-kernel-threads.patch queue-6.6/rtla-timerlat_hist-set-osnoise_workload-for-kernel-threads.patch queue-6.6/revert-rtla-timerlat_hist-set-osnoise_workload-for-kernel-threads.patch queue-6.6/tracing-fix-bad-hist-from-corrupting-named_triggers-list.patch