X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fwrapper%2Fpage_alloc.h;h=6ebc5845e343e74f5bc2500346795c86070a8d09;hb=5a90857e90423e5849fafc875ff1eacc6f56d5ac;hp=c74e6d68d17b05abba373c64dbdab1ad9d326b71;hpb=686eb00593241450a0bd19faa68c0725abd63b0c;p=lttng-modules.git

diff --git a/include/wrapper/page_alloc.h b/include/wrapper/page_alloc.h
index c74e6d68..6ebc5845 100644
--- a/include/wrapper/page_alloc.h
+++ b/include/wrapper/page_alloc.h
@@ -12,29 +12,20 @@
 #ifndef _LTTNG_WRAPPER_PAGE_ALLOC_H
 #define _LTTNG_WRAPPER_PAGE_ALLOC_H
 
-#include <lttng/kernel-version.h>
+#include <linux/mm_types.h>
 
 /*
  * We need to redefine get_pfnblock_flags_mask to our wrapper, because
  * the get_pageblock_migratetype() macro uses it.
  */
-#if (defined(CONFIG_KALLSYMS) \
-	&& (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) \
-		|| LTTNG_UBUNTU_KERNEL_RANGE(3,16,7,34, 3,17,0,0)))
+#ifdef CONFIG_KALLSYMS
 
 #define get_pfnblock_flags_mask		wrapper_get_pfnblock_flags_mask
 
-#include <linux/mm_types.h>
-
 int wrapper_get_pfnblock_flags_mask_init(void);
 
 #else
 
-#include <linux/mm_types.h>
-
 static inline
 int wrapper_get_pfnblock_flags_mask_init(void)
 {
@@ -43,36 +34,4 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 
 #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 */