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

James Morse
2025-04-24T17:11:10Z

Hi Reinette,

On 16/04/2025 03:18, Reinette Chatre wrote:
> 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.

>> 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?

Yes! It took a while of staring at build errors to work out what those things were about...

I'll also fix the 'harmless' comment in the commit message with Fenghua's description of
the ftrace thing.

Thanks,

James