Re: [PATCH v1 1/4] tools/rtla: Consolidate nr_cpus usage across all tools
From: Tomas Glozar <tglozar@redhat.com>
Date: 2025-12-16 14:41:46
Also in:
bpf, lkml
pá 5. 12. 2025 v 16:19 odesílatel Costa Shulyupin [off-list ref] napsal:
quoted hunk ↗ jump to hunk
diff --git a/tools/tracing/rtla/src/timerlat_u.c b/tools/tracing/rtla/src/timerlat_u.c index ce68e39d25fd..a569fe7f93aa 100644 --- a/tools/tracing/rtla/src/timerlat_u.c +++ b/tools/tracing/rtla/src/timerlat_u.c@@ -16,7 +16,7 @@ #include <sys/wait.h> #include <sys/prctl.h> -#include "utils.h" +#include "common.h" #include "timerlat_u.h"
Since commit 2f3172f9dd58c ("tools/rtla: Consolidate code between
osnoise/timerlat and hist/top") that was merged into 6.18, common.h
includes timerlat_u.h. Your change thus causes a double include of
timerlat_u.h, leading to a build error:
In file included from src/timerlat_u.c:20:
src/timerlat_u.h:6:8: error: redefinition of ‘struct timerlat_u_params’
6 | struct timerlat_u_params {
| ^~~~~~~~~~~~~~~~~
In file included from src/common.h:5,
from src/timerlat_u.c:19:
src/timerlat_u.h:6:8: note: originally defined here
6 | struct timerlat_u_params {
| ^~~~~~~~~~~~~~~~~
Please rebase your patchset and fix this so that timerlat_u.h is only
included once.
Tomas