The patch titled
Subject: MIPS: Netlogic: Fix build error
has been added to the -mm tree. Its filename is
dma-mapping-consolidate-dma_allocfree_attrscoherent-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/dma-mapping-consolidate-dma_allocfree_attrscoherent-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/dma-mapping-consolidate-dma_allocfree_attrscoherent-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: Guenter Roeck <linux@xxxxxxxxxxxx>
Subject: MIPS: Netlogic: Fix build error
The variable 'ret' is no longer used in nlm_dma_alloc_coherent()
and causes the following build error.
arch/mips/netlogic/common/nlm-dma.c: In function 'nlm_dma_alloc_coherent':
arch/mips/netlogic/common/nlm-dma.c:50:8: error: unused variable 'ret'
Fixes: e4d0d18739dc ("dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}")
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/netlogic/common/nlm-dma.c | 2 --
1 file changed, 2 deletions(-)
diff -puN arch/mips/netlogic/common/nlm-dma.c~dma-mapping-consolidate-dma_allocfree_attrscoherent-fix arch/mips/netlogic/common/nlm-dma.c
--- a/arch/mips/netlogic/common/nlm-dma.c~dma-mapping-consolidate-dma_allocfree_attrscoherent-fix
+++ a/arch/mips/netlogic/common/nlm-dma.c
@@ -47,8 +47,6 @@ static char *nlm_swiotlb;
static void *nlm_dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
{
- void *ret;
-
/* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxx are
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.patch
dma-mapping-consolidate-dma_allocfree_attrscoherent-fix.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
