X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fwrapper%2Fwriteback.h;h=71369ab260d2c655e213c8f8b799f3f4e32cdb93;hb=9f881196ed338466afb648a679e17160c30e8761;hp=74b5482ca3b6957bc9b8fb17e250bb519e4619dd;hpb=3dfec2289896ff0f1a05a9e486f1585cd16beb84;p=lttng-modules.git diff --git a/include/wrapper/writeback.h b/include/wrapper/writeback.h index 74b5482c..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 LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) - static struct wb_domain *global_wb_domain_sym; static inline @@ -51,39 +46,6 @@ unsigned long __canary__global_wb_domain(void) return global_wb_domain.dirty_limit; } -#else - -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 @@ -94,6 +56,6 @@ unsigned long wrapper_global_dirty_limit(void) return global_dirty_limit; } -#endif +#endif /* CONFIG_KALLSYMS_ALL */ #endif /* _LTTNG_WRAPPER_WRITEBACK_H */