X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fpage_alloc.h;h=3c7c1ea60a487ba378439df602c9d44c1fc79234;hb=be41221e6ca82cae9b89aea8c992ed7f88451baf;hp=06e2ddcb858c577fa8db63c02668e5962dd12393;hpb=165eee701dce7f180d958125c1794459280fe64d;p=lttng-modules.git

diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h
index 06e2ddcb..3c7c1ea6 100644
--- a/wrapper/page_alloc.h
+++ b/wrapper/page_alloc.h
@@ -31,7 +31,9 @@
  * We need to redefine get_pfnblock_flags_mask to our wrapper, because
  * the get_pageblock_migratetype() macro uses it.
  */
-#if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2))
+#if (defined(CONFIG_KALLSYMS) \
+	&& (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2) \
+		|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0)))
 
 #define get_pfnblock_flags_mask		wrapper_get_pfnblock_flags_mask
 
@@ -39,7 +41,7 @@
 
 int wrapper_get_pfnblock_flags_mask_init(void);
 
-#else /* #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */
+#else
 
 #include <linux/mm_types.h>
 
@@ -49,6 +51,38 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 	return 0;
 }
 
-#endif /* else #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */
+#endif
+
+/*
+ * For a specific range of Ubuntu 3.13 kernels, we need to redefine
+ * get_pageblock_flags_mask to our wrapper, because the
+ * get_pageblock_migratetype() macro uses it. This function has been
+ * introduced into mainline within commit
+ * e58469bafd0524e848c3733bc3918d854595e20f, but never actually showed
+ * up in a stable kernel version, since it has been changed by commit
+ * dc4b0caff24d9b2918e9f27bc65499ee63187eba. Since Ubuntu chose to only
+ * backport the former commit but not the latter, we need to do a
+ * special case to cover this.
+ */
+#if (defined(CONFIG_KALLSYMS) \
+	&& LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0))
+
+#define get_pageblock_flags_mask	wrapper_get_pageblock_flags_mask
+
+#include <linux/mm_types.h>
+
+int wrapper_get_pageblock_flags_mask_init(void);
+
+#else
+
+#include <linux/mm_types.h>
+
+static inline
+int wrapper_get_pageblock_flags_mask_init(void)
+{
+	return 0;
+}
+
+#endif
 
 #endif /* _LTTNG_WRAPPER_PAGE_ALLOC_H */