diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-03 16:00:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:10:15 +0000 |
| commit | c947f69fff183e5d2a06160d9262b5dab7359e95 (patch) | |
| tree | 717ced5b4c10d022809e3611ccd938236cef18e6 /arch | |
| parent | 151f52f09c5728ecfdd0c289da1a4b30bb416f2c (diff) | |
| download | op-kernel-dev-c947f69fff183e5d2a06160d9262b5dab7359e95.zip op-kernel-dev-c947f69fff183e5d2a06160d9262b5dab7359e95.tar.gz | |
ARM: Fix DMA coherent allocator alignment
An out by one bug meant that the DMA coherent allocator was aligning
to one more bit than it should, causing it to run out of available
memory quicker. Fix this.
Reported-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -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 e4dd064..ac6a361 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -198,7 +198,7 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot) * fragmentation of the DMA space, and also prevents allocations * smaller than a section from crossing a section boundary. */ - bit = fls(size - 1) + 1; + bit = fls(size - 1); if (bit > SECTION_SHIFT) bit = SECTION_SHIFT; align = 1 << bit; |
