Patch "dmaengine: bcm2835: fix 64-bit warning" has been added to the 4.7-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-10-05 13:13:58
This is a note to let you know that I've just added the patch titled
dmaengine: bcm2835: fix 64-bit warning
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
dmaengine-bcm2835-fix-64-bit-warning.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 4aa819c79bb73f3d1bdf5244d0a0f7f15261504c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 30 Jun 2016 14:47:10 +0200
Subject: dmaengine: bcm2835: fix 64-bit warning
From: Arnd Bergmann <arnd@arndb.de>
commit 4aa819c79bb73f3d1bdf5244d0a0f7f15261504c upstream.
When building this driver on arm64, we get a harmless type
mismatch warning:
drivers/dma/bcm2835-dma.c: In function 'bcm2835_dma_fill_cb_chain_with_sg':
include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
(void) (&_min1 == &_min2); \
^
drivers/dma/bcm2835-dma.c:409:21: note: in expansion of macro 'min'
cb->cb->length = min(len, max_len);
This changes the type of the 'len' variable to size_t, which
avoids the problem.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 388cc7a281c0 ("dmaengine: bcm2835: add slave_sg support to bcm2835-dma")
Signed-off-by: Vinod Koul <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/dma/bcm2835-dma.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c@@ -393,11 +393,12 @@ static void bcm2835_dma_fill_cb_chain_wi unsigned int sg_len) { struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); - size_t max_len = bcm2835_dma_max_frame_length(c); - unsigned int i, len; + size_t len, max_len; + unsigned int i; dma_addr_t addr; struct scatterlist *sgent; + max_len = bcm2835_dma_max_frame_length(c); for_each_sg(sgl, sgent, sg_len, i) { for (addr = sg_dma_address(sgent), len = sg_dma_len(sgent); len > 0;
Patches currently in stable-queue which might be from arnd@arndb.de are queue-4.7/dmaengine-bcm2835-fix-64-bit-warning.patch queue-4.7/gspca-avoid-unused-variable-warnings.patch queue-4.7/iwlwifi-mvm-avoid-harmless-wmaybe-uninialized-warning.patch queue-4.7/lib-test_hash.c-fix-warning-in-two-dimensional-array-init.patch queue-4.7/arm-8617-1-dma-fix-dma_max_pfn.patch