From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 20:23:05 +0000 (-0400)
Subject: instrumentation: preemptirq: remove compatibility code
X-Git-Tag: for-upstreaming-review-1~53
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=477df04015836adb19017e31ee99c01a9b369ced

instrumentation: preemptirq: remove compatibility code
---

diff --git a/instrumentation/events/lttng-module/preemptirq.h b/instrumentation/events/lttng-module/preemptirq.h
index d34f8d6b..b69868ed 100644
--- a/instrumentation/events/lttng-module/preemptirq.h
+++ b/instrumentation/events/lttng-module/preemptirq.h
@@ -28,16 +28,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(preemptirq_template,
 	)
 )
 
-/*
- * Tracing of irq enable / disable events is enabled
- *   on >= 4.19 when CONFIG_TRACE_IRQFLAGS is defined.
- *   on previous kernels when CONFIG_PROVE_LOCKING is NOT defined.
- */
 #if defined(CONFIG_TRACE_IRQFLAGS)
 #define LTTNG_TRACE_IRQ
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0) && \
-	!defined(CONFIG_PROVE_LOCKING))
-#define LTTNG_TRACE_IRQ
 #endif
 
 #ifdef LTTNG_TRACE_IRQ
@@ -60,16 +52,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(preemptirq_template, irq_enable,
 )
 #endif /* LTTNG_TRACE_IRQ */
 
-/*
- * Tracing of preempt enable / disable events is enabled
- *   on >= 4.19 when CONFIG_TRACE_PREEMPT_TOGGLE is defined.
- *   on previous kernels when CONFIG_DEBUG_PREEMPT is defined.
- */
 #if defined(CONFIG_TRACE_PREEMPT_TOGGLE)
 #define LTTNG_TRACE_PREEMPT
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0) && \
-	defined(CONFIG_DEBUG_PREEMPT))
-#define LTTNG_TRACE_PREEMPT
 #endif
 
 #ifdef LTTNG_TRACE_PREEMPT