archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-07 23:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

delayacct: fix build regression on accounting tool

Browse source 
The accounting tool was modified for the original ABI using a custom
'timespec64' type in linux/taskstats.h, which I changed to use the regular
__kernel_timespec type, causing a build failure:

        getdelays.c:202:45: warning: 'struct timespec64' declared inside parameter list will not be visible outside of this definition or declaration

     202 | static const char *format_timespec64(struct timespec64 *ts)
         |                                             ^~~~~~~~~~

Change the tool to match the updated header.

Link: https://lkml.kernel.org/r/20260210103427.2984963-1-arnd@kernel.org
Fixes: 503efe850c ("delayacct: add timestamp of delay max")
Fixes: f06e31eef4c1 ("delayacct: fix uapi timespec64 definition")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202602091611.lxgINqXp-lkp@intel.com/
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Arnd Bergmann 2026-02-10 11:34:22 +01:00 • committed by Andrew Morton
parent 0dddf20b4f
commit 9333980c23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/accounting/getdelays.c
View file

@ -196,20 +196,20 @@ static int get_family_id(int sd)
#define delay_ms(t) (t / 1000000ULL)
/*
* Format timespec64 to human readable string (YYYY-MM-DD HH:MM:SS)
* Format __kernel_timespec to human readable string (YYYY-MM-DD HH:MM:SS)
* Returns formatted string or "N/A" if timestamp is zero
*/
static const char *format_timespec64(struct timespec64 *ts)
static const char *format_timespec(struct __kernel_timespec *ts)
{
static char buffer[32];
struct tm tm_info;
time_t time_sec;
__kernel_time_t time_sec;
/* Check if timestamp is zero (not set) */
if (ts->tv_sec == 0 && ts->tv_nsec == 0)
return "N/A";
time_sec = (time_t)ts->tv_sec;
time_sec = ts->tv_sec;
/* Use thread-safe localtime_r */
if (localtime_r(&time_sec, &tm_info) == NULL)
@ -257,7 +257,7 @@ static const char *format_timespec64(struct timespec64 *ts)
average_ms((double)(t)->cpu_delay_total, (t)->cpu_count), \
delay_ms((double)(t)->cpu_delay_max), \
delay_ms((double)(t)->cpu_delay_min), \
format_timespec64(&(t)->cpu_delay_max_ts)); \
format_timespec(&(t)->cpu_delay_max_ts)); \
} else if (version >= 16) { \
printf("%-10s%15s%15s%15s%15s%15s%15s%15s\n", \
"CPU", "count", "real total", "virtual total", \
@ -316,7 +316,7 @@ static const char *format_timespec64(struct timespec64 *ts)
average_ms((double)(t)->total, (t)->count), \
delay_ms((double)(t)->max), \
delay_ms((double)(t)->min), \
format_timespec64(&(t)->max_ts)); \
format_timespec(&(t)->max_ts)); \
} else if (version >= 16) { \
printf("%-10s%15s%15s%15s%15s%15s\n", \
name, "count", "delay total", "delay average", \