Drop support for kernels < 4.4 from ns contexts

Change-Id: Ie10299af93193415adfafeccb1c59c4b8c0a0bc0
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index e6d662bbc146c2dec7ba45024022f487c1800b2e..28108a0f543d6fab46e806c7d57ef20003e49760 100644 (file)
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_IPC_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -19,9 +21,6 @@
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_IPC_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index cc41dc7d489380ca89c69c2bfa8e2047598bb5a7..c4bf5593fe9bd34ee8d1aab68ac2b2aa11c39a55 100644 (file)
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -19,9 +21,6 @@
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
-#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 #include <../fs/mount.h>
 
 static

diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c
index 4bc046db1bf494363dc5dbc41f502e88ebad4808..ad6d6d2af24a32296e06e5d67bcdaa6f18e082f1 100644 (file)
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_NET_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -20,9 +22,6 @@
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_NET_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {

diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c
index fa66b1dda277c7549c38fb57e6feec0b5837bf06..7458ed322d23a5aa194e5d94dde723998b1f132b 100644 (file)
--- a/src/lttng-context-pid-ns.c
+++ b/src/lttng-context-pid-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_PID_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -19,9 +21,6 @@
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_PID_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t pid_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {

diff --git a/src/lttng-context-user-ns.c b/src/lttng-context-user-ns.c
index ab9afa4edade5c9fe47cfb52cb3cfc37e81e7385..f7ee3f913234c9ecc7de246488e5b385e4317182 100644 (file)
--- a/src/lttng-context-user-ns.c
+++ b/src/lttng-context-user-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_USER_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -19,9 +21,6 @@
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_USER_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t user_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {

diff --git a/src/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c
index 455b16038bdad31edef3457ddd3fb4168761449e..ca0c58fc11e01681aa3d9d4d656afc478362bddf 100644 (file)
--- a/src/lttng-context-uts-ns.c
+++ b/src/lttng-context-uts-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_UTS_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -19,9 +21,6 @@
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_UTS_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t uts_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {