diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-07 16:11:51 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-12 09:04:26 +0100 |
commit | 4c4ccb0277644107cf73aeb2ac3d6a2cfbe47e81 (patch) | |
tree | 7213cf0bfd186376d73f58881ada0d9c03e6a7d8 /meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch | |
parent | 4ed9d2b969ce1c54fa2ebb3f8a137f0093ed7d60 (diff) | |
download | poky-4c4ccb0277644107cf73aeb2ac3d6a2cfbe47e81.tar.gz |
lttng-modules: upgrade 2.10.8 -> 2.10.9
Remove the backported patches.
(From OE-Core rev: c0a0590eed7b60c8da5a496169f2ab6f19f4f06f)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch b/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch deleted file mode 100644 index 4ffe488677..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 416cee8707053a9015dfec8332e12f8c263098e3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
3 | Date: Thu, 14 Feb 2019 11:40:50 -0500 | ||
4 | Subject: [PATCH 9/9] Cleanup: tp mempool: Remove logically dead code | ||
5 | |||
6 | Found by Coverity: | ||
7 | CID 1391045 (#1 of 1): Logically dead code (DEADCODE) | ||
8 | |||
9 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
10 | |||
11 | Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/416cee8707053a9015dfec8332e12f8c263098e3 | ||
12 | |||
13 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
14 | --- | ||
15 | lttng-tp-mempool.c | 11 ++--------- | ||
16 | 1 file changed, 2 insertions(+), 9 deletions(-) | ||
17 | |||
18 | diff --git a/lttng-tp-mempool.c b/lttng-tp-mempool.c | ||
19 | index d984bd4..21e8376 100644 | ||
20 | --- a/lttng-tp-mempool.c | ||
21 | +++ b/lttng-tp-mempool.c | ||
22 | @@ -151,19 +151,12 @@ void lttng_tp_mempool_free(void *ptr) | ||
23 | struct lttng_tp_buf_entry *entry; | ||
24 | struct per_cpu_buf *cpu_buf; | ||
25 | |||
26 | - if (!ptr) { | ||
27 | + if (!ptr) | ||
28 | goto end; | ||
29 | - } | ||
30 | - | ||
31 | entry = container_of(ptr, struct lttng_tp_buf_entry, buf); | ||
32 | - if (!entry) { | ||
33 | - goto end; | ||
34 | - } | ||
35 | - | ||
36 | cpu_buf = per_cpu_ptr(pool, entry->cpu); | ||
37 | - if (!cpu_buf) { | ||
38 | + if (!cpu_buf) | ||
39 | goto end; | ||
40 | - } | ||
41 | /* Add it to the free list. */ | ||
42 | list_add_tail(&entry->list, &cpu_buf->free_list); | ||
43 | |||
44 | -- | ||
45 | 2.19.1 | ||
46 | |||