diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-25 10:38:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-25 10:38:19 -0700 |
| commit | 5c0a981fb1cacddc9a35dd87ea74045abd640942 (patch) | |
| tree | 824f9f36c974fca1abd6f0251580e144dd005947 | |
| parent | bug.h: Fix up CONFIG_BUG=n implicit function declarations. (diff) | |
| parent | ARM: dma-mapping: fix buffer chunk allocation order (diff) | |
| download | linux-dev-5c0a981fb1cacddc9a35dd87ea74045abd640942.tar.xz linux-dev-5c0a981fb1cacddc9a35dd87ea74045abd640942.zip | |
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/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
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index d766e4256b74..4044abcf6f9d 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -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) |