From f740341af86ed65e3cec0f71b4a6bb8a788563e3 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 7 Jul 2020 11:15:39 -0400 Subject: [PATCH] fix: vmalloc on v5.8 without KALLSYMS Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: Ic945dad92e78a5bc2895a969a10c527e1349decf --- include/wrapper/vmalloc.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/wrapper/vmalloc.h b/include/wrapper/vmalloc.h index 596fb9ed..f742f48f 100644 --- a/include/wrapper/vmalloc.h +++ b/include/wrapper/vmalloc.h @@ -117,9 +117,19 @@ void __canary__vmalloc_sync_all(void) #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) */ -#else +#else /* CONFIG_KALLSYMS */ + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) + +/* + * wrapper_vmalloc_sync_mappings was removed in v5.8, the vmalloc mappings + * are now synchronized when they are created or torn down. + */ +static inline +void wrapper_vmalloc_sync_mappings(void) +{} -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) \ +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) \ || LTTNG_KERNEL_RANGE(5,5,12, 5,6,0) \ || LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \ || LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \ -- 2.34.1