X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Fpage_alloc.c;h=b464f4d19331facd14510bf6aeed8294ff1c5135;hb=b78104db53f97c10add30016e365855a26f6e01e;hp=149bff82078d5facc27ff21ef6bb95a8eac6029f;hpb=0e14d6e771153a9d4f1b52cb57e3fbce52d1749d;p=lttng-modules.git

diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c
index 149bff82..b464f4d1 100644
--- a/wrapper/page_alloc.c
+++ b/wrapper/page_alloc.c
@@ -1,4 +1,4 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
  * wrapper/page_alloc.c
  *
  * wrapper around get_pfnblock_flags_mask and Ubuntu
@@ -7,33 +7,22 @@
  * 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) \
-		|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0)))
+	&& (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)))
 
 #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,
@@ -63,6 +52,26 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 		return -1;
 	return 0;
 }
+EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
+
+/*
+ * Canary function to check for 'get_pfnblock_flags_mask()' at compile time.
+ *
+ * From 'include/linux/pageblock-flags.h':
+ *
+ *   unsigned long get_pfnblock_flags_mask(struct page *page,
+ *                                         unsigned long pfn,
+ *                                         unsigned long end_bitidx,
+ *                                         unsigned long mask);
+ */
+__attribute__((unused)) static
+unsigned long __canary__get_pfnblock_flags_mask(struct page *page,
+						unsigned long pfn,
+						unsigned long end_bitidx,
+						unsigned long mask)
+{
+	return get_pfnblock_flags_mask(page, pfn, end_bitidx, mask);
+}
 
 #else
 
@@ -76,8 +85,8 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 #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_pageblock_flags_mask_sym)(struct page *page,
@@ -105,6 +114,7 @@ int wrapper_get_pageblock_flags_mask_init(void)
 		return -1;
 	return 0;
 }
+EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
 
 #else