Fix: add missing versions and init call for page_alloc wrapper

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lttng-events.c b/lttng-events.c
index aac9c5899355df496ec5a31f9635b43918220726..ffb605106ab6f775f467a7409f507947a1cdbc95 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -2195,6 +2195,9 @@ static int __init lttng_events_init(void)
        if (ret)
                return ret;
        ret = wrapper_get_pfnblock_flags_mask_init();
+       if (ret)
+               return ret;
+       ret = wrapper_get_pageblock_flags_mask_init();
        if (ret)
                return ret;
        ret = lttng_context_init();

diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c
index 149bff82078d5facc27ff21ef6bb95a8eac6029f..fd8cfa847cdce7216c4e55faba111fc3a722b892 100644 (file)
--- a/wrapper/page_alloc.c
+++ b/wrapper/page_alloc.c
@@ -26,8 +26,11 @@
 #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)))
+       && (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>

diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h
index 3c7c1ea60a487ba378439df602c9d44c1fc79234..2736e2f361cfbebb86f3566adbb9dcbe04ebfae4 100644 (file)
--- a/wrapper/page_alloc.h
+++ b/wrapper/page_alloc.h
@@ -32,8 +32,11 @@
  * the get_pageblock_migratetype() macro uses it.
  */
 #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)))
+       && (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