Re: [PATCH v8 18/21] x86,fs/resctrl: Remove duplicated trace header files

[Reinette Chatre]

Hi James,

On 4/11/25 9:42 AM, James Morse wrote:
> The copy-pasting python script harmlessly creates some empty trace
> point header files. Remove them.
> 
> Signed-off-by: James Morse <james.morse@xxxxxxx>
> Tested-by: Peter Newman <peternewman@xxxxxxxxxx>
> Tested-by: Shaopeng Tan <tan.shaopeng@xxxxxxxxxxxxxx>
> Tested-by: Amit Singh Tomar <amitsinght@xxxxxxxxxxx> # arm64
> Tested-by: Shanker Donthineni <sdonthineni@xxxxxxxxxx> # arm64
> Tested-by: Babu Moger <babu.moger@xxxxxxx>
> ---
>  arch/x86/kernel/cpu/resctrl/monitor.c       |  4 ----
>  arch/x86/kernel/cpu/resctrl/monitor_trace.h | 17 -----------------
>  fs/resctrl/pseudo_lock.c                    |  4 ----
>  fs/resctrl/pseudo_lock_trace.h              | 17 -----------------
>  4 files changed, 42 deletions(-)
>  delete mode 100644 arch/x86/kernel/cpu/resctrl/monitor_trace.h
>  delete mode 100644 fs/resctrl/pseudo_lock_trace.h
> 
> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
> index 1809e3fe6ef3..800e52845b1d 100644
> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
> @@ -27,10 +27,6 @@
>  
>  #include "internal.h"
>  
> -#define CREATE_TRACE_POINTS
> -
> -#include "monitor_trace.h"
> -
>  /*
>   * Global boolean for rdt_monitor which is true if any
>   * resource monitoring is enabled.
> diff --git a/arch/x86/kernel/cpu/resctrl/monitor_trace.h b/arch/x86/kernel/cpu/resctrl/monitor_trace.h
> deleted file mode 100644
> index b5a142dd0f0e..000000000000
> --- a/arch/x86/kernel/cpu/resctrl/monitor_trace.h
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#undef TRACE_SYSTEM
> -#define TRACE_SYSTEM resctrl
> -
> -#if !defined(_FS_RESCTRL_MONITOR_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
> -#define _FS_RESCTRL_MONITOR_TRACE_H
> -
> -#include <linux/tracepoint.h>
> -
> -#endif /* _FS_RESCTRL_MONITOR_TRACE_H */
> -
> -#undef TRACE_INCLUDE_PATH
> -#define TRACE_INCLUDE_PATH .
> -
> -#define TRACE_INCLUDE_FILE monitor_trace
> -
> -#include <trace/define_trace.h>

Should the "CFLAGS_monitor.o = -I$(src)" be removed from arch/x86/kernel/cpu/resctrl/Makefile
as part of the above changes?

Reinette