X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Firq.h;h=a66b81398f9ea1c40369bab3ad92ce0bce015af0;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=502b08eb5dcc9abb9954f1a6718ed4d3641a42e1;hpb=6ec43db836429730c1431809049197a4fbe820fa;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/irq.h b/instrumentation/events/lttng-module/irq.h
index 502b08eb..a66b8139 100644
--- a/instrumentation/events/lttng-module/irq.h
+++ b/instrumentation/events/lttng-module/irq.h
@@ -1,10 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq
 
 #if !defined(LTTNG_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_IRQ_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 
 #ifndef _TRACE_IRQ_DEF_
 #define _TRACE_IRQ_DEF_
@@ -60,7 +61,6 @@ LTTNG_TRACEPOINT_EVENT(irq_handler_exit,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
 LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq,
 
 	TP_PROTO(unsigned int vec_nr),
@@ -119,71 +119,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise,
 
 	TP_ARGS(vec_nr)
 )
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */
-LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq,
-
-	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-
-	TP_ARGS(h, vec),
-
-	TP_FIELDS(
-		ctf_integer(unsigned int, vec, (int)(h - vec))
-	)
-)
-
-/**
- * softirq_entry - called immediately before the softirq handler
- * @h: pointer to struct softirq_action
- * @vec: pointer to first struct softirq_action in softirq_vec array
- *
- * When used in combination with the softirq_exit tracepoint
- * we can determine the softirq handler runtine.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_entry,
-
-	irq_softirq_entry,
-
-	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-
-	TP_ARGS(h, vec)
-)
-
-/**
- * softirq_exit - called immediately after the softirq handler returns
- * @h: pointer to struct softirq_action
- * @vec: pointer to first struct softirq_action in softirq_vec array
- *
- * When used in combination with the softirq_entry tracepoint
- * we can determine the softirq handler runtine.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_exit,
-
-	irq_softirq_exit,
-
-	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-
-	TP_ARGS(h, vec)
-)
-
-/**
- * softirq_raise - called immediately when a softirq is raised
- * @h: pointer to struct softirq_action
- * @vec: pointer to first struct softirq_action in softirq_vec array
- *
- * When used in combination with the softirq_entry tracepoint
- * we can determine the softirq raise to run latency.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise,
-
-	irq_softirq_raise,
-
-	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-
-	TP_ARGS(h, vec)
-)
-#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */
 
 #endif /*  LTTNG_TRACE_IRQ_H */
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>