From e7126a82652be3660371ef411aad36022b1c83c7 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 21 Nov 2022 12:00:15 -0500 Subject: [PATCH] Drop support for kernels < 4.4 from module instrumentation Change-Id: Idcd0cd197272d2efbd511c05afff6240b72740ae Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/instrumentation/events/module.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/include/instrumentation/events/module.h b/include/instrumentation/events/module.h index 06b20c64..b1686bf1 100644 --- a/include/instrumentation/events/module.h +++ b/include/instrumentation/events/module.h @@ -31,11 +31,7 @@ LTTNG_TRACEPOINT_ENUM(taint, TP_ENUM_VALUES( ctf_enum_value("PROPRIETARY_MODULE", 1UL << TAINT_PROPRIETARY_MODULE) ctf_enum_value("FORCED_MODULE", 1UL << TAINT_FORCED_MODULE) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0)) ctf_enum_value("CPU_OUT_OF_SPEC", 1UL << TAINT_CPU_OUT_OF_SPEC) -#else - ctf_enum_value("UNSAFE_SMP", 1UL << TAINT_UNSAFE_SMP) -#endif ctf_enum_value("FORCED_RMMOD", 1UL << TAINT_FORCED_RMMOD) ctf_enum_value("MACHINE_CHECK", 1UL << TAINT_MACHINE_CHECK) ctf_enum_value("BAD_PAGE", 1UL << TAINT_BAD_PAGE) @@ -45,18 +41,10 @@ LTTNG_TRACEPOINT_ENUM(taint, ctf_enum_value("WARN", 1UL << TAINT_WARN) ctf_enum_value("CRAP", 1UL << TAINT_CRAP) ctf_enum_value("FIRMWARE_WORKAROUND", 1UL << TAINT_FIRMWARE_WORKAROUND) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,2,0)) ctf_enum_value("OOT_MODULE", 1UL << TAINT_OOT_MODULE) -#endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0)) ctf_enum_value("UNSIGNED_MODULE", 1UL << TAINT_UNSIGNED_MODULE) -#endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0)) ctf_enum_value("SOFTLOCKUP", 1UL << TAINT_SOFTLOCKUP) -#endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0)) ctf_enum_value("LIVEPATCH", 1UL << TAINT_LIVEPATCH) -#endif #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) ctf_enum_value("AUX", 1UL << TAINT_AUX) #endif @@ -100,11 +88,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt, TP_FIELDS( ctf_integer_hex(unsigned long, ip, ip) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,0)) ctf_integer(int, refcnt, atomic_read(&mod->refcnt)) -#else - ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs)) -#endif ctf_string(name, mod->name) ) ) -- 2.34.1