Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/dmatest.c between commit 632fd28326c0 ("dmatest: implement
two helpers to unmap dma memory") from the tree and commit f04f98e91bd8
("dmatest: adjust invalid module parameters for number of source
buffers") from the slave-dma tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/dma/dmatest.c
index 64b048d,0e2deaa..0000000
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -228,20 -228,13 +228,27 @@@ static void dmatest_callback(void *arg
wake_up_all(done->wait);
}
+static inline void unmap_src(struct device *dev, dma_addr_t *addr, size_t len,
+ unsigned int count)
+{
+ while (count--)
+ dma_unmap_single(dev, addr[count], len, DMA_TO_DEVICE);
+}
+
+static inline void unmap_dst(struct device *dev, dma_addr_t *addr, size_t len,
+ unsigned int count)
+{
+ while (count--)
+ dma_unmap_single(dev, addr[count], len, DMA_BIDIRECTIONAL);
+}
+
+ static unsigned int min_odd(unsigned int x, unsigned int y)
+ {
+ unsigned int val = min(x, y);
+
+ return val % 2 ? val : val - 1;
+ }
+
/*
* This function repeatedly tests DMA transfers of various lengths and
* offsets for a given operation type until it is told to exit by
Attachment:
pgpMgBshnAk63.pgp
Description: PGP signature
