X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Fpage_alloc.h;h=3a522a9d3307e221a68e19af688c9879d3d3d485;hb=00017921de3dfbca2cd0f062bbd07a2f644618bd;hp=5e84b5c0e6b39f68324170d66ce4d4f6efd2f49e;hpb=ffc696db884c44a49780bcd9e3b0f97ef82d2382;p=lttng-modules.git

diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h
index 5e84b5c0..3a522a9d 100644
--- a/wrapper/page_alloc.h
+++ b/wrapper/page_alloc.h
@@ -25,15 +25,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../lttng-kernel-version.h"
+#include <lttng-kernel-version.h>
 
 /*
  * 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) \
-		|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0)))
+	&& (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)))
 
 #define get_pfnblock_flags_mask		wrapper_get_pfnblock_flags_mask
 
@@ -41,7 +44,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>
 
@@ -51,6 +54,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 */