X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fpage_alloc.c;h=512e09f98ec0ee1308e1a75b54c6bf32df1e076c;hb=1c999280e7f232e6c2e41d8c76020e795a649648;hp=184ec71c221c0885b6753057c4571e8ee48b06f3;hpb=389d70703bbd804c4f000d89ef2efbe169c6028f;p=lttng-modules.git

diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c
index 184ec71c..512e09f9 100644
--- a/wrapper/page_alloc.c
+++ b/wrapper/page_alloc.c
@@ -1,36 +1,28 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  * wrapper/page_alloc.c
  *
- * wrapper around get_pfnblock_flags_mask. Using KALLSYMS to get its address
- * when available, else we need to have a kernel that exports this function to
- * GPL modules.
+ * wrapper around get_pfnblock_flags_mask and Ubuntu
+ * get_pageblock_flags_mask. Using KALLSYMS to get their address when
+ * available, else we need to have a kernel that exports this function
+ * to 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"
+#include <lttng-kernel-version.h>
 
-#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)))
 
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
 #include <linux/module.h>
-#include "kallsyms.h"
-#include "page_alloc.h"
+#include <wrapper/kallsyms.h>
+#include <wrapper/page_alloc.h>
 
 static
 unsigned long (*get_pfnblock_flags_mask_sym)(struct page *page,
@@ -60,9 +52,53 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 		return -1;
 	return 0;
 }
+EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
+
+#else
+
+#include <linux/pageblock-flags.h>
+
+#endif
+
+#if (defined(CONFIG_KALLSYMS) \
+	&& LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0))
+
+#include <linux/kallsyms.h>
+#include <linux/mm_types.h>
+#include <linux/module.h>
+#include <wrapper/kallsyms.h>
+#include <wrapper/page_alloc.h>
+
+static
+unsigned long (*get_pageblock_flags_mask_sym)(struct page *page,
+		unsigned long end_bitidx,
+		unsigned long mask);
+
+unsigned long wrapper_get_pageblock_flags_mask(struct page *page,
+		unsigned long end_bitidx,
+		unsigned long mask)
+{
+	WARN_ON_ONCE(!get_pageblock_flags_mask_sym);
+	if (get_pageblock_flags_mask_sym) {
+		return get_pageblock_flags_mask_sym(page, end_bitidx, mask);
+	} else {
+		return -ENOSYS;
+	}
+}
+EXPORT_SYMBOL_GPL(wrapper_get_pageblock_flags_mask);
+
+int wrapper_get_pageblock_flags_mask_init(void)
+{
+	get_pageblock_flags_mask_sym =
+		(void *) kallsyms_lookup_funcptr("get_pageblock_flags_mask");
+	if (!get_pageblock_flags_mask_sym)
+		return -1;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
 
-#else /* #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */
+#else
 
 #include <linux/pageblock-flags.h>
 
-#endif /* #else #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */
+#endif