Patchwork lttng-modules: update to 2.4.1-stable latest

login
register
mail settings
Submitter Bruce Ashfield
Date June 18, 2014, 1:29 a.m.
Message ID <1403054991-19506-1-git-send-email-bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/73979/
State Accepted
Commit 2934b25a37b6d1d09b6c6853959530be414931cb
Headers show

Comments

Bruce Ashfield - June 18, 2014, 1:29 a.m.
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]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/lttng/lttng-modules_2.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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 4ef74dd1cb33..5e05ffc69853 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"
 
 inherit module
 
-SRCREV = "afdc6b155161f209fcfadc5288dc017ceab56353"
+SRCREV = "a0383def517e3aebbbcebae61fe2bcfb50d31e71"
 PV = "2.4.1"
 
 # lttng currently blacklists arm with gcc-4.8