+ nios2-convert-to-dma_map_ops-fix.patch added to -mm tree

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

 



The patch titled
     Subject: nios2: dma mapping fixes
has been added to the -mm tree.  Its filename is
     nios2-convert-to-dma_map_ops-fix.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/nios2-convert-to-dma_map_ops-fix.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/nios2-convert-to-dma_map_ops-fix.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: nios2: dma mapping fixes

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/nios2/mm/dma-mapping.c |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff -puN arch/nios2/mm/dma-mapping.c~nios2-convert-to-dma_map_ops-fix arch/nios2/mm/dma-mapping.c
--- a/arch/nios2/mm/dma-mapping.c~nios2-convert-to-dma_map_ops-fix
+++ a/arch/nios2/mm/dma-mapping.c
@@ -128,7 +128,7 @@ static void nios2_dma_unmap_page(struct
 	__dma_sync_for_cpu(phys_to_virt(dma_address), size, direction);
 }
 
-static void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
 		int nhwentries, enum dma_data_direction direction,
 		struct dma_attrs *attrs)
 {
@@ -183,13 +183,15 @@ static void nios2_dma_sync_sg_for_device
 }
 
 struct dma_map_ops nios2_dma_ops = {
-	.alloc                  = nios2_dma_alloc,
-	.free                   = nios2_dma_free,
-	.map_page               = nios2_dma_map_page,
-	.map_sg                 = nios2_dma_map_sg,
-	.sync_single_for_device = nios2_dma_sync_single_for_device,
-	.sync_single_for_cpu    = nios2_dma_sync_single_for_cpu,
-	.sync_sg_for_cpu        = nios2_dma_sync_sg_for_cpu,
-	.sync_sg_for_dev        = nios2_dma_sync_sg_for_device,
+	.alloc			= nios2_dma_alloc,
+	.free			= nios2_dma_free,
+	.map_page		= nios2_dma_map_page,
+	.unmap_page		= nios2_dma_unmap_page,
+	.map_sg			= nios2_dma_map_sg,
+	.unmap_sg		= nios2_dma_unmap_sg,
+	.sync_single_for_device	= nios2_dma_sync_single_for_device,
+	.sync_single_for_cpu	= nios2_dma_sync_single_for_cpu,
+	.sync_sg_for_cpu	= nios2_dma_sync_sg_for_cpu,
+	.sync_sg_for_device	= nios2_dma_sync_sg_for_device,
 };
 EXPORT_SYMBOL(nios2_dma_ops);
_

Patches currently in -mm which might be from hch@xxxxxx are

dma-mapping-make-the-generic-coherent-dma-mmap-implementation-optional.patch
arc-convert-to-dma_map_ops.patch
arc-convert-to-dma_map_ops-fix.patch
avr32-convert-to-dma_map_ops.patch
blackfin-convert-to-dma_map_ops.patch
c6x-convert-to-dma_map_ops.patch
c6x-convert-to-dma_map_ops-fix-2.patch
cris-convert-to-dma_map_ops.patch
nios2-convert-to-dma_map_ops.patch
nios2-convert-to-dma_map_ops-fix.patch
frv-convert-to-dma_map_ops.patch
parisc-convert-to-dma_map_ops.patch
mn10300-convert-to-dma_map_ops.patch
m68k-convert-to-dma_map_ops.patch
metag-convert-to-dma_map_ops.patch
sparc-use-generic-dma_set_mask.patch
tile-uninline-dma_set_mask.patch
dma-mapping-always-provide-the-dma_map_ops-based-implementation.patch
dma-mapping-remove-asm-generic-dma-coherenth.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