diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-17 21:29:51 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-18 10:44:10 +0100 |
commit | 2934b25a37b6d1d09b6c6853959530be414931cb (patch) | |
tree | 74d4f98b1b79117d79913138f04def09e9099190 /meta | |
parent | 3d9723240384f7a7dd250d6926887661d199793a (diff) | |
download | poky-2934b25a37b6d1d09b6c6853959530be414931cb.tar.gz |
lttng-modules: update to 2.4.1-stable latest
The 3.15, and 3.14.5+ kernels introduced a change to trace_block_rq_complete,
which triggers the following build error:
probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:151:6:
error: conflicting types for 'trace_block_rq_complete'
| void trace_##_name(_proto);
| ^
|
probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:117:2:
note: in expansion of macro 'DEFINE_EVENT_MAP'
| DEFINE_EVENT_MAP(template, name, name, PARAMS(proto), PARAMS(args))
| ^
|
probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/block.h:235:1:
note: in expansion of macro 'DEFINE_EVENT'
| DEFINE_EVENT(block_rq_with_error, block_rq_complete,
The lttng 2.4.x-stable branch contains the fix (and several other small fixes), so
we bump the SRCREV to import the change.
Build tested against 3.14 and 3.10.
[YOCTO #6459]
(From OE-Core rev: bb304f306c0f6ee496a75a67c0bb8a6c1e41ddf2)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb index 4ef74dd1cb..5e05ffc698 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb | |||
@@ -10,7 +10,7 @@ DEPENDS = "virtual/kernel" | |||
10 | 10 | ||
11 | inherit module | 11 | inherit module |
12 | 12 | ||
13 | SRCREV = "afdc6b155161f209fcfadc5288dc017ceab56353" | 13 | SRCREV = "a0383def517e3aebbbcebae61fe2bcfb50d31e71" |
14 | PV = "2.4.1" | 14 | PV = "2.4.1" |
15 | 15 | ||
16 | # lttng currently blacklists arm with gcc-4.8 | 16 | # lttng currently blacklists arm with gcc-4.8 |