X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Fpage_alloc.h;fp=wrapper%2Fpage_alloc.h;h=f336fcb0f4dbaff5e9b2c4ebdbda719ea737da9b;hb=7d5f6cefe2d5ff9122d996252b2ece0cd94c1130;hp=06e2ddcb858c577fa8db63c02668e5962dd12393;hpb=66861b2e35992cbbab6ac1b52127bb4fb96ed3b6;p=lttng-modules.git diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h index 06e2ddcb..f336fcb0 100644 --- a/wrapper/page_alloc.h +++ b/wrapper/page_alloc.h @@ -39,7 +39,7 @@ int wrapper_get_pfnblock_flags_mask_init(void); -#else /* #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */ +#else #include @@ -49,6 +49,38 @@ int wrapper_get_pfnblock_flags_mask_init(void) return 0; } -#endif /* else #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */ +#endif + +/* + * For a specific range of Ubuntu 3.13 kernels, we need to redefine + * get_pageblock_flags_mask to our wrapper, because the + * get_pageblock_migratetype() macro uses it. This function has been + * introduced into mainline within commit + * e58469bafd0524e848c3733bc3918d854595e20f, but never actually showed + * up in a stable kernel version, since it has been changed by commit + * dc4b0caff24d9b2918e9f27bc65499ee63187eba. Since Ubuntu chose to only + * backport the former commit but not the latter, we need to do a + * special case to cover this. + */ +#if (defined(CONFIG_KALLSYMS) \ + && LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0)) + +#define get_pageblock_flags_mask wrapper_get_pageblock_flags_mask + +#include + +int wrapper_get_pageblock_flags_mask_init(void); + +#else + +#include + +static inline +int wrapper_get_pageblock_flags_mask_init(void) +{ + return 0; +} + +#endif #endif /* _LTTNG_WRAPPER_PAGE_ALLOC_H */