projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ASoC level IO tracing removed upstream
[lttng-modules.git]
/
instrumentation
/
events
/
lttng-module
/
asoc.h
diff --git
a/instrumentation/events/lttng-module/asoc.h
b/instrumentation/events/lttng-module/asoc.h
index 79ffc26e607b11e299046688f62e9a1c877b1dcf..7eee03599155b85bba5bccee26c3f99101b5383f 100644
(file)
--- a/
instrumentation/events/lttng-module/asoc.h
+++ b/
instrumentation/events/lttng-module/asoc.h
@@
-4,7
+4,7
@@
#if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
#define LTTNG_TRACE_ASOC_H
#if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
#define LTTNG_TRACE_ASOC_H
-#include
"../../../probes/lttng-tracepoint-event.h"
+#include
<probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
#include <linux/version.h>
#include <linux/ktime.h>
#include <linux/version.h>
@@
-14,14
+14,16
@@
#define _TRACE_ASOC_DEF
struct snd_soc_jack;
struct snd_soc_codec;
#define _TRACE_ASOC_DEF
struct snd_soc_jack;
struct snd_soc_codec;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \
+ LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
struct snd_soc_platform;
#endif
struct snd_soc_card;
struct snd_soc_dapm_widget;
#endif
struct snd_soc_platform;
#endif
struct snd_soc_card;
struct snd_soc_dapm_widget;
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(3,10,0,514,0,0, 3,11,0,0,0,0))
#define CODEC_NAME_FIELD component.name
#define CODEC_ID_FIELD component.id
#else
#define CODEC_NAME_FIELD component.name
#define CODEC_ID_FIELD component.id
#else
@@
-29,6
+31,7
@@
struct snd_soc_dapm_widget;
#define CODEC_ID_FIELD id
#endif
#define CODEC_ID_FIELD id
#endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
/*
* Log register events
*/
/*
* Log register events
*/
@@
-68,8
+71,10
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_reg, snd_soc_reg_read,
TP_ARGS(codec, reg, val)
)
TP_ARGS(codec, reg, val)
)
+#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \
+ LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg,
TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg,
TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
@@
-345,4
+350,4
@@
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
#endif /* LTTNG_TRACE_ASOC_H */
/* This part must be outside protection */
#endif /* LTTNG_TRACE_ASOC_H */
/* This part must be outside protection */
-#include
"../../../probes/define_trace.h"
+#include
<probes/define_trace.h>
This page took
0.027403 seconds
and
4
git commands to generate.