Namespace kernel version macros

[lttng-modules.git] / instrumentation / events / lttng-module / jbd2.h

diff --git a/instrumentation/events/lttng-module/jbd2.h b/instrumentation/events/lttng-module/jbd2.h
index 10e3073fe972bb6a698e386fde9999880b4cbb10..46563a943ebe80448ab60ff6912378d09ff0fa78 100644 (file)
--- a/instrumentation/events/lttng-module/jbd2.h
+++ b/instrumentation/events/lttng-module/jbd2.h
@@ -7,15 +7,13 @@
 
 #include <probes/lttng-tracepoint-event.h>
 #include <linux/jbd2.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
 #ifndef _TRACE_JBD2_DEF
 #define _TRACE_JBD2_DEF
 struct transaction_chp_stats_s;
 struct transaction_run_stats_s;
 #endif
-#endif
 
 LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
 
@@ -70,7 +68,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_commit_logging,
        TP_ARGS(journal, commit_transaction)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
 
        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
@@ -103,7 +101,6 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
 LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,
        TP_PROTO(dev_t dev, unsigned long tid,
                 struct transaction_run_stats_s *stats),
@@ -139,10 +136,8 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
                ctf_integer(__u32, dropped, stats->cs_dropped)
        )
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,
 #else
 LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
@@ -161,9 +156,8 @@ LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
                ctf_integer(unsigned long, freed, freed)
        )
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
 
        TP_PROTO(journal_t *journal, int write_op),