From 36561775ae9348c849fe261cabeccd13038e04fd Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 12 Feb 2016 15:11:04 -0500 Subject: [PATCH] Fix: add missing versions and init call for page_alloc wrapper Signed-off-by: Mathieu Desnoyers --- lttng-events.c | 3 +++ wrapper/page_alloc.c | 7 +++++-- wrapper/page_alloc.h | 7 +++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lttng-events.c b/lttng-events.c index 1e988ebe..71b53017 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -2269,6 +2269,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 149bff82..fd8cfa84 100644 --- 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 #include diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h index 3c7c1ea6..2736e2f3 100644 --- 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 -- 2.34.1