From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- ...nup-tp-mempool-Remove-logically-dead-code.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch (limited to 'poky/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch') diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch new file mode 100644 index 000000000..4ffe48867 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch @@ -0,0 +1,46 @@ +From 416cee8707053a9015dfec8332e12f8c263098e3 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Thu, 14 Feb 2019 11:40:50 -0500 +Subject: [PATCH 9/9] Cleanup: tp mempool: Remove logically dead code + +Found by Coverity: +CID 1391045 (#1 of 1): Logically dead code (DEADCODE) + +Signed-off-by: Mathieu Desnoyers + +Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/416cee8707053a9015dfec8332e12f8c263098e3 + +Signed-off-by: Bruce Ashfield +--- + lttng-tp-mempool.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/lttng-tp-mempool.c b/lttng-tp-mempool.c +index d984bd4..21e8376 100644 +--- a/lttng-tp-mempool.c ++++ b/lttng-tp-mempool.c +@@ -151,19 +151,12 @@ void lttng_tp_mempool_free(void *ptr) + struct lttng_tp_buf_entry *entry; + struct per_cpu_buf *cpu_buf; + +- if (!ptr) { ++ if (!ptr) + goto end; +- } +- + entry = container_of(ptr, struct lttng_tp_buf_entry, buf); +- if (!entry) { +- goto end; +- } +- + cpu_buf = per_cpu_ptr(pool, entry->cpu); +- if (!cpu_buf) { ++ if (!cpu_buf) + goto end; +- } + /* Add it to the free list. */ + list_add_tail(&entry->list, &cpu_buf->free_list); + +-- +2.19.1 + -- cgit v1.2.1