[merged] dmaengine-dmatest-correct-thread_count-while-using-multiple-thread-per-channel.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     dmaengine: dmatest: correct thread_count while using multiple thread per channel
has been removed from the -mm tree.  Its filename was
     dmaengine-dmatest-correct-thread_count-while-using-multiple-thread-per-channel.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: dmaengine: dmatest: correct thread_count while using multiple thread per channel
From: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>

It seems that thread_count is not properly calculated in dmatest.  In fact
the thread count number that is returned from dmatest_add_threads() is not
correctly added to the thread_count and thus not properly printed.

Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@xxxxxxxxx>
Acked-by: Maciej Sosnowski <maciej.sosnowski@xxxxxxxxx>
Cc: "Williams, Dan J" <dan.j.williams@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/dma/dmatest.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/dma/dmatest.c~dmaengine-dmatest-correct-thread_count-while-using-multiple-thread-per-channel drivers/dma/dmatest.c
--- a/drivers/dma/dmatest.c~dmaengine-dmatest-correct-thread_count-while-using-multiple-thread-per-channel
+++ a/drivers/dma/dmatest.c
@@ -495,11 +495,11 @@ static int dmatest_add_channel(struct dm
 
 	if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask)) {
 		cnt = dmatest_add_threads(dtc, DMA_MEMCPY);
-		thread_count += cnt > 0 ?: 0;
+		thread_count += cnt > 0 ? cnt : 0;
 	}
 	if (dma_has_cap(DMA_XOR, dma_dev->cap_mask)) {
 		cnt = dmatest_add_threads(dtc, DMA_XOR);
-		thread_count += cnt > 0 ?: 0;
+		thread_count += cnt > 0 ? cnt : 0;
 	}
 
 	pr_info("dmatest: Started %u threads using %s\n",
_

Patches currently in -mm which might be from nicolas.ferre@xxxxxxxxx are

linux-next.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux