]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/irq: Define trace events conditionally
authorArnd Bergmann <arnd@arndb.de>
Tue, 25 Feb 2025 21:32:33 +0000 (22:32 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 25 Feb 2025 21:44:35 +0000 (22:44 +0100)
When both of X86_LOCAL_APIC and X86_THERMAL_VECTOR are disabled,
the irq tracing produces a W=1 build warning for the tracing
definitions:

  In file included from include/trace/trace_events.h:27,
                 from include/trace/define_trace.h:113,
                 from arch/x86/include/asm/trace/irq_vectors.h:383,
                 from arch/x86/kernel/irq.c:29:
  include/trace/stages/init.h:2:23: error: 'str__irq_vectors__trace_system_name' defined but not used [-Werror=unused-const-variable=]

Make the tracepoints conditional on the same symbosl that guard
their usage.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250225213236.3141752-1-arnd@kernel.org
arch/x86/kernel/irq.c

index 385e3a5fc3045823fd7992b596deb29ed0215984..feca4f20b06aaa164b0298e8ad1c0338272ba859 100644 (file)
 #include <asm/posted_intr.h>
 #include <asm/irq_remapping.h>
 
+#if defined(CONFIG_X86_LOCAL_APIC) || defined(CONFIG_X86_THERMAL_VECTOR)
 #define CREATE_TRACE_POINTS
 #include <asm/trace/irq_vectors.h>
+#endif
 
 DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
 EXPORT_PER_CPU_SYMBOL(irq_stat);