Commit 5c0a981f authored Jun 25, 2012 by Linus Torvalds

linux-dma-mapping

Git pull DMA-mapping fix from Marek Szyprowski:
 "Another minor fixup for ARM dma-mapping redesign and extensions merged
  in this merge window"

* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: fix buffer chunk allocation order

parents 09682c1d 593f4735

arch/arm/mm/dma-mapping.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1067,7 +1067,7 @@ static struct page *__iommu_alloc_buffer(struct device dev, size_t size, gfp_t
		return NULL;

		while (count) {
		int j, order = __ffs(count);
		int j, order = __fls(count);

		pages[i] = alloc_pages(gfp \| __GFP_NOWARN, order);
		while (!pages[i] && order)