From de1263f367baef8ccec2f85f0555e8bdb08d56f2 Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Fri, 15 Sep 2023 14:24:35 +0100 Subject: [PATCH] lisa._assets.kmodules.lisa: Fix conditional presence of lisa__sched_cpu_capacity.capacity_orig field FIX Ensure we don't refer to capacity_orig field when it is not compiled-in. --- lisa/_assets/kmodules/lisa/ftrace_events.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisa/_assets/kmodules/lisa/ftrace_events.h b/lisa/_assets/kmodules/lisa/ftrace_events.h index 802d211cf..213cd0d48 100644 --- a/lisa/_assets/kmodules/lisa/ftrace_events.h +++ b/lisa/_assets/kmodules/lisa/ftrace_events.h @@ -397,14 +397,17 @@ TRACE_EVENT(lisa__sched_cpu_capacity, ), TP_printk( - "cpu=%d capacity=%lu capacity_orig=%lu" + "cpu=%d" + " capacity=%lu" #if HAS_KERNEL_FEATURE(FREQ_INVARIANCE) + " capacity_orig=%lu" " capacity_curr=%lu" #endif - , - __entry->cpu, __entry->capacity, __entry->capacity_orig + ,__entry->cpu + ,__entry->capacity #if HAS_KERNEL_FEATURE(FREQ_INVARIANCE) - , __entry->capacity_curr + ,__entry->capacity_orig + ,__entry->capacity_curr #endif ) ); -- GitLab