summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-11-19 13:48:33 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:09 +0000
commitc375976149ccd499d0e73026a933b3cb071eaff9 (patch)
tree31c24355e93713172e28eb7c0a62f4a5e74e5fa3 /meta/recipes-kernel/lttng
parentf5c1b570eb1afde4543ff5431efa5e7cf80df65f (diff)
downloadpoky-c375976149ccd499d0e73026a933b3cb071eaff9.tar.gz
lttng-ust: Upgrade to 2.7 release
(From OE-Core rev: d63f9a33c26dc1536ea4345c76eb49bd1b00f7a7) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch42
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_git.bb10
2 files changed, 4 insertions, 48 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
deleted file mode 100644
index 03120fe5d6..0000000000
--- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 6d02a6c1aeb1d050ffe7c6624bab9acfa76fc05f Mon Sep 17 00:00:00 2001
2From: Mikael Beckius <mikael.beckius@windriver.com>
3Date: Tue, 12 May 2015 11:04:34 +0200
4Subject: [PATCH] lttng-ust:Fix live timer calculation error
5
6There is an calculation error for live timer. Variable chan->switch_timer_interval is
7based on microsecond, and it is not right to assign chan->switch_timer_interval mod
81000000 to var tv_nsec which is based on nanosecond.
9
10Upstream-Status: Pending
11
12Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
13Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
14---
15 libringbuffer/ring_buffer_frontend.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
19index eb4e486..e0377a3 100644
20--- a/libringbuffer/ring_buffer_frontend.c
21+++ b/libringbuffer/ring_buffer_frontend.c
22@@ -528,7 +528,7 @@ void lib_ring_buffer_channel_switch_timer_start(struct channel *chan)
23 }
24
25 its.it_value.tv_sec = chan->switch_timer_interval / 1000000;
26- its.it_value.tv_nsec = chan->switch_timer_interval % 1000000;
27+ its.it_value.tv_nsec = (chan->switch_timer_interval % 1000000) * 1000;
28 its.it_interval.tv_sec = its.it_value.tv_sec;
29 its.it_interval.tv_nsec = its.it_value.tv_nsec;
30
31@@ -582,7 +582,7 @@ void lib_ring_buffer_channel_read_timer_start(struct channel *chan)
32 }
33
34 its.it_value.tv_sec = chan->read_timer_interval / 1000000;
35- its.it_value.tv_nsec = chan->read_timer_interval % 1000000;
36+ its.it_value.tv_nsec = (chan->read_timer_interval % 1000000) * 1000;
37 its.it_interval.tv_sec = its.it_value.tv_sec;
38 its.it_interval.tv_nsec = its.it_value.tv_nsec;
39
40--
411.9.1
42
diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb
index ae4afd3d89..1c08403a32 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb
@@ -18,14 +18,12 @@ RPROVIDES_${PN} = "lttng2-ust"
18RREPLACES_${PN} = "lttng2-ust" 18RREPLACES_${PN} = "lttng2-ust"
19RCONFLICTS_${PN} = "lttng2-ust" 19RCONFLICTS_${PN} = "lttng2-ust"
20 20
21SRCREV = "c49ee9040ada6984c880756614e8a6f7fd645bd6" 21SRCREV = "826c6c686f16b9aeb3100f3f880d630911691cf1"
22PE = "2" 22PE = "2"
23PV = "2.6.2+git${SRCPV}" 23PV = "2.7.0+git${SRCPV}"
24 24
25SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ 25SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.7 \
26 file://lttng-ust-doc-examples-disable.patch \ 26 file://lttng-ust-doc-examples-disable.patch"
27 file://lttng-ust-Fix-live-timer-calculation-error.patch \
28 "
29 27
30S = "${WORKDIR}/git" 28S = "${WORKDIR}/git"
31 29