X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fwrapper%2Fpage_alloc.c;h=a03838fad4f2b2d2f3ced26f80068305a0ba786f;hb=5a90857e90423e5849fafc875ff1eacc6f56d5ac;hp=93504c993883244cb692ab192abef040148737d6;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=lttng-modules.git

diff --git a/src/wrapper/page_alloc.c b/src/wrapper/page_alloc.c
index 93504c99..a03838fa 100644
--- a/src/wrapper/page_alloc.c
+++ b/src/wrapper/page_alloc.c
@@ -9,14 +9,7 @@
  * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <lttng/kernel-version.h>
-
-#if (defined(CONFIG_KALLSYMS) \
-	&& (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)	\
-		|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0)		\
-		|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0)		\
-		|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \
-		|| LTTNG_UBUNTU_KERNEL_RANGE(3,16,7,34, 3,17,0,0)))
+#ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
@@ -54,48 +47,24 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 }
 EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
 
-#else
-
-#include <linux/pageblock-flags.h>
-
-#endif
-
-#if (defined(CONFIG_KALLSYMS) \
-	&& LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0))
-
-#include <linux/kallsyms.h>
-#include <linux/mm_types.h>
-#include <linux/module.h>
-#include <wrapper/kallsyms.h>
-#include <wrapper/page_alloc.h>
-
-static
-unsigned long (*get_pageblock_flags_mask_sym)(struct page *page,
-		unsigned long end_bitidx,
-		unsigned long mask);
-
-unsigned long wrapper_get_pageblock_flags_mask(struct page *page,
-		unsigned long end_bitidx,
-		unsigned long mask)
-{
-	WARN_ON_ONCE(!get_pageblock_flags_mask_sym);
-	if (get_pageblock_flags_mask_sym) {
-		return get_pageblock_flags_mask_sym(page, end_bitidx, mask);
-	} else {
-		return -ENOSYS;
-	}
-}
-EXPORT_SYMBOL_GPL(wrapper_get_pageblock_flags_mask);
-
-int wrapper_get_pageblock_flags_mask_init(void)
+/*
+ * Canary function to check for 'get_pfnblock_flags_mask()' at compile time.
+ *
+ * From 'include/linux/pageblock-flags.h':
+ *
+ *   unsigned long get_pfnblock_flags_mask(struct page *page,
+ *                                         unsigned long pfn,
+ *                                         unsigned long end_bitidx,
+ *                                         unsigned long mask);
+ */
+__attribute__((unused)) static
+unsigned long __canary__get_pfnblock_flags_mask(struct page *page,
+						unsigned long pfn,
+						unsigned long end_bitidx,
+						unsigned long mask)
 {
-	get_pageblock_flags_mask_sym =
-		(void *) kallsyms_lookup_funcptr("get_pageblock_flags_mask");
-	if (!get_pageblock_flags_mask_sym)
-		return -1;
-	return 0;
+	return get_pfnblock_flags_mask(page, pfn, end_bitidx, mask);
 }
-EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
 
 #else