diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-25 13:38:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-25 13:38:19 -0400 |
| commit | 5c0a981fb1cacddc9a35dd87ea74045abd640942 (patch) | |
| tree | 824f9f36c974fca1abd6f0251580e144dd005947 | |
| parent | 09682c1dd3820445a27d32dcbeee6a6eafff3dc9 (diff) | |
| parent | 593f47355467b9ef44293698817e2bdb347e2d11 (diff) | |
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 | |||
| 1067 | return NULL; | 1067 | return NULL; |
| 1068 | 1068 | ||
| 1069 | while (count) { | 1069 | while (count) { |
| 1070 | int j, order = __ffs(count); | 1070 | int j, order = __fls(count); |
| 1071 | 1071 | ||
| 1072 | pages[i] = alloc_pages(gfp | __GFP_NOWARN, order); | 1072 | pages[i] = alloc_pages(gfp | __GFP_NOWARN, order); |
| 1073 | while (!pages[i] && order) | 1073 | while (!pages[i] && order) |