projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Namespace kernel version macros
[lttng-modules.git]
/
wrapper
/
tracepoint.h
diff --git
a/wrapper/tracepoint.h
b/wrapper/tracepoint.h
index 3883e11ab13b82065dd88504ada80260c4a28373..9b3f90d60252c398017fabde1b3a7413e98eb352 100644
(file)
--- a/
wrapper/tracepoint.h
+++ b/
wrapper/tracepoint.h
@@
-10,16
+10,24
@@
#ifndef _LTTNG_WRAPPER_TRACEPOINT_H
#define _LTTNG_WRAPPER_TRACEPOINT_H
#ifndef _LTTNG_WRAPPER_TRACEPOINT_H
#define _LTTNG_WRAPPER_TRACEPOINT_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/tracepoint.h>
#include <linux/module.h>
#include <linux/tracepoint.h>
#include <linux/module.h>
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,35))
#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
#endif
#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
#endif
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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
#ifndef HAVE_KABI_2635_TRACEPOINT
#define kabi_2635_tracepoint_probe_register tracepoint_probe_register
@@
-27,14
+35,14
@@
#endif /* HAVE_KABI_2635_TRACEPOINT */
#endif /* HAVE_KABI_2635_TRACEPOINT */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0))
#include <lttng-tracepoint.h>
#define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister
#include <lttng-tracepoint.h>
#define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
#define lttng_wrapper_tracepoint_probe_register kabi_2635_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister kabi_2635_tracepoint_probe_unregister
#define lttng_wrapper_tracepoint_probe_register kabi_2635_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister kabi_2635_tracepoint_probe_unregister
@@
-50,9
+58,9
@@
void lttng_tracepoint_exit(void)
{
}
{
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG))
#include <linux/kallsyms.h>
#include <wrapper/kallsyms.h>
#include <linux/kallsyms.h>
#include <wrapper/kallsyms.h>
@@
-85,9
+93,9
@@
int wrapper_tracepoint_module_notify(struct notifier_block *nb,
* }
*/
* }
*/
-#endif /* #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG)) */
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE))
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
@@
-108,7
+116,7
@@
int wrapper_lttng_fixup_sig(struct module *mod)
return ret;
}
return ret;
}
-#else /* #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
@@
-116,18
+124,18
@@
int wrapper_lttng_fixup_sig(struct module *mod)
return 0;
}
return 0;
}
-#endif /* #else #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0))
static inline struct tracepoint *lttng_tracepoint_ptr_deref(tracepoint_ptr_t *p)
{
return tracepoint_ptr_deref(p);
}
static inline struct tracepoint *lttng_tracepoint_ptr_deref(tracepoint_ptr_t *p)
{
return tracepoint_ptr_deref(p);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0)) */
static inline struct tracepoint *lttng_tracepoint_ptr_deref(struct tracepoint * const *p)
{
return *p;
}
static inline struct tracepoint *lttng_tracepoint_ptr_deref(struct tracepoint * const *p)
{
return *p;
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0)) */
#endif /* _LTTNG_WRAPPER_TRACEPOINT_H */
#endif /* _LTTNG_WRAPPER_TRACEPOINT_H */
This page took
0.039618 seconds
and
4
git commands to generate.