From c375976149ccd499d0e73026a933b3cb071eaff9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 19 Nov 2015 13:48:33 -0200 Subject: lttng-ust: Upgrade to 2.7 release (From OE-Core rev: d63f9a33c26dc1536ea4345c76eb49bd1b00f7a7) Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...ttng-ust-Fix-live-timer-calculation-error.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch (limited to 'meta/recipes-kernel/lttng/lttng-ust') 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 @@ -From 6d02a6c1aeb1d050ffe7c6624bab9acfa76fc05f Mon Sep 17 00:00:00 2001 -From: Mikael Beckius -Date: Tue, 12 May 2015 11:04:34 +0200 -Subject: [PATCH] lttng-ust:Fix live timer calculation error - -There is an calculation error for live timer. Variable chan->switch_timer_interval is -based on microsecond, and it is not right to assign chan->switch_timer_interval mod -1000000 to var tv_nsec which is based on nanosecond. - -Upstream-Status: Pending - -Signed-off-by: Mikael Beckius -Signed-off-by: Jianchuan Wang ---- - libringbuffer/ring_buffer_frontend.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c -index eb4e486..e0377a3 100644 ---- a/libringbuffer/ring_buffer_frontend.c -+++ b/libringbuffer/ring_buffer_frontend.c -@@ -528,7 +528,7 @@ void lib_ring_buffer_channel_switch_timer_start(struct channel *chan) - } - - its.it_value.tv_sec = chan->switch_timer_interval / 1000000; -- its.it_value.tv_nsec = chan->switch_timer_interval % 1000000; -+ its.it_value.tv_nsec = (chan->switch_timer_interval % 1000000) * 1000; - its.it_interval.tv_sec = its.it_value.tv_sec; - its.it_interval.tv_nsec = its.it_value.tv_nsec; - -@@ -582,7 +582,7 @@ void lib_ring_buffer_channel_read_timer_start(struct channel *chan) - } - - its.it_value.tv_sec = chan->read_timer_interval / 1000000; -- its.it_value.tv_nsec = chan->read_timer_interval % 1000000; -+ its.it_value.tv_nsec = (chan->read_timer_interval % 1000000) * 1000; - its.it_interval.tv_sec = its.it_value.tv_sec; - its.it_interval.tv_nsec = its.it_value.tv_nsec; - --- -1.9.1 - -- cgit v1.2.3-54-g00ecf