X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Ftracepoint.h;h=bc19d8c123139cd27aceea1c579b9f962e7e044f;hb=37defeefc44301f0f894b0ecc236740fc118ff3f;hp=08e8ccabff3eb910bf06b42f9c9fe54aa5cc55e3;hpb=9cd95afe04c5d8a055f3ecafdb3bea7d4360f92d;p=lttng-modules.git diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h index 08e8ccab..bc19d8c1 100644 --- a/wrapper/tracepoint.h +++ b/wrapper/tracepoint.h @@ -14,6 +14,14 @@ #include #include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) +#define LTTNG_DEFINE_TRACE(name, proto, args) \ + DEFINE_TRACE(name, PARAMS(proto), PARAMS(args)) +#else +#define LTTNG_DEFINE_TRACE(name, proto, args) \ + DEFINE_TRACE(name) +#endif + #ifndef HAVE_KABI_2635_TRACEPOINT #define kabi_2635_tracepoint_probe_register tracepoint_probe_register @@ -68,6 +76,17 @@ int wrapper_tracepoint_module_notify(struct notifier_block *nb, } } +/* + * No canary for 'tracepoint_module_notify()', it's only defined in 'kernel/tracepoint.c'. + * + * static inline + * int __canary__tracepoint_module_notify(struct notifier_block *nb, + * unsigned long val, struct module *mod) + * { + * return tracepoint_module_notify(nb, val, mod); + * } + */ + #endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG)) */ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE))