Namespace kernel version macros

[lttng-modules.git] / wrapper / page_alloc.c

diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c
index 40998199a5bcfa9a85f3de78c2e3a0ae5fddec2e..b464f4d19331facd14510bf6aeed8294ff1c5135 100644 (file)
--- a/wrapper/page_alloc.c
+++ b/wrapper/page_alloc.c
@@ -12,7 +12,7 @@
 #include <lttng-kernel-version.h>
 
 #if (defined(CONFIG_KALLSYMS) \
-       && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)        \
+       && (LTTNG_LINUX_VERSION_CODE >= LTTNG_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) \
@@ -54,6 +54,25 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 }
 EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
 
+/*
+ * 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)
+{
+       return get_pfnblock_flags_mask(page, pfn, end_bitidx, mask);
+}
+
 #else
 
 #include <linux/pageblock-flags.h>