From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Nov 2022 21:50:59 +0000 (-0500)
Subject: Drop support for kernels < 4.4 from 'wrapper/writeback.h'
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9f881196ed338466afb648a679e17160c30e8761;p=lttng-modules.git

Drop support for kernels < 4.4 from 'wrapper/writeback.h'

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

diff --git a/include/wrapper/writeback.h b/include/wrapper/writeback.h
index e62de713..71369ab2 100644
--- a/include/wrapper/writeback.h
+++ b/include/wrapper/writeback.h
@@ -12,16 +12,11 @@
 #ifndef _LTTNG_WRAPPER_WRITEBACK_H
 #define _LTTNG_WRAPPER_WRITEBACK_H
 
-#include <lttng/kernel-version.h>
-
 #ifdef CONFIG_KALLSYMS_ALL
+
 #include <linux/kallsyms.h>
 #include <wrapper/kallsyms.h>
 
-
-
-#if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)
-
 static struct wb_domain *global_wb_domain_sym;
 
 static inline
@@ -51,51 +46,16 @@ unsigned long __canary__global_wb_domain(void)
 	return global_wb_domain.dirty_limit;
 }
 
-#elif LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)
-
-static unsigned long *global_dirty_limit_sym;
-
-static inline
-unsigned long wrapper_global_dirty_limit(void)
-{
-	if (!global_dirty_limit_sym)
-		global_dirty_limit_sym =
-			(void *) kallsyms_lookup_dataptr("global_dirty_limit");
-	if (global_dirty_limit_sym) {
-		return *global_dirty_limit_sym;
-	} else {
-		printk_once(KERN_WARNING "LTTng: global_dirty_limit symbol lookup failed.\n");
-		return 0;
-	}
-}
-
-/*
- * Canary function to check for 'global_dirty_limit' at compile time.
- *
- * From 'include/linux/writeback.h':
- *
- *   extern unsigned long global_dirty_limit;
- */
-static inline
-unsigned long __canary__global_dirty_limit(void)
-{
-	return global_dirty_limit;
-}
-
-#endif
-
 #else /* CONFIG_KALLSYMS_ALL */
 
 #include <linux/writeback.h>
 
-#if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)
 static inline
 unsigned long wrapper_global_dirty_limit(void)
 {
 	return global_dirty_limit;
 }
-#endif
 
-#endif
+#endif /* CONFIG_KALLSYMS_ALL */
 
 #endif /* _LTTNG_WRAPPER_WRITEBACK_H */