The patch titled
cris/arch-v32: fix dma_declare_coherent_memory wrong allocation
has been removed from the -mm tree. Its filename was
cris-arch-v32-fix-dma_declare_coherent_memory-wrong-allocation.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: cris/arch-v32: fix dma_declare_coherent_memory wrong allocation
From: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
arch/cris/arch-v32 seems to have copy-pasted the bug from arch/i386 fixed
with an earlier patch - allocate bitmap in bytes, not words.
Signed-off-by: G. Liakhovetski <g.liakhovetski@xxxxxx>
Cc: Mikael Starvik <starvik@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/cris/arch-v32/drivers/pci/dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/cris/arch-v32/drivers/pci/dma.c~cris-arch-v32-fix-dma_declare_coherent_memory-wrong-allocation arch/cris/arch-v32/drivers/pci/dma.c
--- a/arch/cris/arch-v32/drivers/pci/dma.c~cris-arch-v32-fix-dma_declare_coherent_memory-wrong-allocation
+++ a/arch/cris/arch-v32/drivers/pci/dma.c
@@ -76,7 +76,7 @@ int dma_declare_coherent_memory(struct d
{
void __iomem *mem_base;
int pages = size >> PAGE_SHIFT;
- int bitmap_size = (pages + 31)/32;
+ int bitmap_size = DIV_ROUND_UP(pages, 8);
if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
goto out;
_
Patches currently in -mm which might be from g.liakhovetski@xxxxxx are
git-powerpc.patch
cris-arch-v32-fix-dma_declare_coherent_memory-wrong-allocation.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
