summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch113
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb1
2 files changed, 114 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch
new file mode 100644
index 0000000000..97b7a53a07
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch
@@ -0,0 +1,113 @@
1
2Upstream-Status: Backport
3
4commit 7df57eb5d6bdc85ddcf2b9afb6cd0cacfb22096e
5Author: Nitin A Kamble <nitin.a.kamble@intel.com>
6Date: Thu Sep 25 18:19:43 2014 -0700
7
8 asoc.h: fix build with v3.17 kernel
9
10 The snd_soc_codec structure has changed in the v3.17 kernel. Some
11 of the redundant fields have been removed. To be specific this commit
12 from the v3.17 kernel causes the build failure for lttng-modules.
13
14 |commit f4333203ec933f9272c90c7add01774ec2cf94d3
15 |Author: Lars-Peter Clausen <lars@metafoo.de>
16 |Date: Mon Jun 16 18:13:02 2014 +0200
17 |
18 | ASoC: Move name and id from CODEC/platform to component
19 |
20 | The component struct already has a name and id field which are initialized to
21 | the same values as the same fields in the CODEC and platform structs. So remove
22 | them from the CODEC and platform structs and used the ones from the component
23 | struct instead.
24 |
25 | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
26 | Signed-off-by: Mark Brown <broonie@linaro.org>
27
28 The asoc.h is changed according to the change in the above kernel commit
29 to fix the lttng-modules build. The change in the lttng-modules code is
30 conditional on the kernel version, so that it does not break builds with
31 previous kernel versions.
32
33 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
34 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
35
36diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h
37index 672bea4..bf9cf86 100644
38--- a/instrumentation/events/lttng-module/asoc.h
39+++ b/instrumentation/events/lttng-module/asoc.h
40@@ -21,6 +21,14 @@ struct snd_soc_card;
41 struct snd_soc_dapm_widget;
42 #endif
43
44+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
45+#define CODEC_NAME_FIELD component.name
46+#define CODEC_ID_FIELD component.id
47+#else
48+#define CODEC_NAME_FIELD name
49+#define CODEC_ID_FIELD id
50+#endif
51+
52 /*
53 * Log register events
54 */
55@@ -32,15 +40,15 @@ DECLARE_EVENT_CLASS(snd_soc_reg,
56 TP_ARGS(codec, reg, val),
57
58 TP_STRUCT__entry(
59- __string( name, codec->name )
60+ __string( name, codec->CODEC_NAME_FIELD )
61 __field( int, id )
62 __field( unsigned int, reg )
63 __field( unsigned int, val )
64 ),
65
66 TP_fast_assign(
67- tp_strcpy(name, codec->name)
68- tp_assign(id, codec->id)
69+ tp_strcpy(name, codec->CODEC_NAME_FIELD)
70+ tp_assign(id, codec->CODEC_ID_FIELD)
71 tp_assign(reg, reg)
72 tp_assign(val, val)
73 ),
74@@ -77,15 +85,15 @@ DECLARE_EVENT_CLASS(snd_soc_preg,
75 TP_ARGS(platform, reg, val),
76
77 TP_STRUCT__entry(
78- __string( name, platform->name )
79+ __string( name, platform->CODEC_NAME_FIELD )
80 __field( int, id )
81 __field( unsigned int, reg )
82 __field( unsigned int, val )
83 ),
84
85 TP_fast_assign(
86- tp_strcpy(name, platform->name)
87- tp_assign(id, platform->id)
88+ tp_strcpy(name, platform->CODEC_NAME_FIELD)
89+ tp_assign(id, platform->CODEC_ID_FIELD)
90 tp_assign(reg, reg)
91 tp_assign(val, val)
92 ),
93@@ -399,17 +407,17 @@ TRACE_EVENT(snd_soc_cache_sync,
94 TP_ARGS(codec, type, status),
95
96 TP_STRUCT__entry(
97- __string( name, codec->name )
98+ __string( name, codec->CODEC_NAME_FIELD )
99 __string( status, status )
100 __string( type, type )
101 __field( int, id )
102 ),
103
104 TP_fast_assign(
105- tp_strcpy(name, codec->name)
106+ tp_strcpy(name, codec->CODEC_NAME_FIELD)
107 tp_strcpy(status, status)
108 tp_strcpy(type, type)
109- tp_assign(id, codec->id)
110+ tp_assign(id, codec->CODEC_ID_FIELD)
111 ),
112
113 TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
index 04e2b0cccc..6ff961a9b1 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \
21 file://Fix-noargs-probes-should-calculate-alignment-and-eve.patch \ 21 file://Fix-noargs-probes-should-calculate-alignment-and-eve.patch \
22 file://Update-statedump-to-3.17-nsproxy-locking.patch \ 22 file://Update-statedump-to-3.17-nsproxy-locking.patch \
23 file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ 23 file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \
24 file://fix_build_with_v3.17_kernel.patch \
24 " 25 "
25 26
26export INSTALL_MOD_DIR="kernel/lttng-modules" 27export INSTALL_MOD_DIR="kernel/lttng-modules"