X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fpage_alloc.h;h=45462ac83dcc0f693a0d30895f3cc97afcc1a28c;hb=cef5d79ec834edb32f33cdf45ad10b3b32e59726;hp=06e2ddcb858c577fa8db63c02668e5962dd12393;hpb=389d70703bbd804c4f000d89ef2efbe169c6028f;p=lttng-modules.git

diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h
index 06e2ddcb..45462ac8 100644
--- a/wrapper/page_alloc.h
+++ b/wrapper/page_alloc.h
@@ -1,7 +1,5 @@
-#ifndef _LTTNG_WRAPPER_PAGE_ALLOC_H
-#define _LTTNG_WRAPPER_PAGE_ALLOC_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * wrapper/page_alloc.h
  *
  * wrapper around get_pfnblock_flags_mask. Using KALLSYMS to get its address
@@ -9,29 +7,23 @@
  * GPL modules.
  *
  * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../lttng-kernel-version.h"
+#ifndef _LTTNG_WRAPPER_PAGE_ALLOC_H
+#define _LTTNG_WRAPPER_PAGE_ALLOC_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))
+#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)))
 
 #define get_pfnblock_flags_mask		wrapper_get_pfnblock_flags_mask
 
@@ -39,7 +31,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 +41,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 */