From 9f881196ed338466afb648a679e17160c30e8761 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 18 Nov 2022 16:50:59 -0500 Subject: [PATCH] Drop support for kernels < 4.4 from 'wrapper/writeback.h' Change-Id: Ie9589e8eee3ca74694dd0671e4eb5dbb53882225 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/wrapper/writeback.h | 44 ++----------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) 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 - #ifdef CONFIG_KALLSYMS_ALL + #include #include - - -#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 -#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 */ -- 2.34.1