X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fwrapper%2Fpage_alloc.c;h=5e19d7b5c786accd74e0a9697ceb3af588dfc3ef;hb=92e2c5feecb39cdd4796da89f2b684e395403040;hp=81835cb2a04191fbd1aef3f45eae20cbc0a12cd6;hpb=5f4c791e2ad2c814101ccdb500e65543f2792c41;p=lttng-modules.git

diff --git a/src/wrapper/page_alloc.c b/src/wrapper/page_alloc.c
index 81835cb2..5e19d7b5 100644
--- a/src/wrapper/page_alloc.c
+++ b/src/wrapper/page_alloc.c
@@ -9,14 +9,7 @@
  * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <lttng/kernel-version.h>
-
-#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
 
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
@@ -37,7 +30,13 @@ unsigned long wrapper_get_pfnblock_flags_mask(struct page *page,
 {
 	WARN_ON_ONCE(!get_pfnblock_flags_mask_sym);
 	if (get_pfnblock_flags_mask_sym) {
-		return get_pfnblock_flags_mask_sym(page, pfn, end_bitidx, mask);
+		struct irq_ibt_state irq_ibt_state;
+		unsigned long ret;
+
+		irq_ibt_state = wrapper_irq_ibt_save();
+		ret = get_pfnblock_flags_mask_sym(page, pfn, end_bitidx, mask);
+		wrapper_irq_ibt_restore(irq_ibt_state);
+		return ret;
 	} else {
 		return -ENOSYS;
 	}
@@ -78,46 +77,3 @@ unsigned long __canary__get_pfnblock_flags_mask(struct page *page,
 #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
-
-#include <linux/pageblock-flags.h>
-
-#endif