summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-14 17:53:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-14 17:53:11 -0700
commit1568d9f425c3fd54ac8d807cf1cbf87ad6b40b27 (patch)
tree7e74f1f5657a13fbfe2a4cd6c06a2e8d3140044b
parent1c23ce720d79494f5a1c2bcd7ebcae7aedc91c98 (diff)
parentf3d87524975f01b885fc3d009c6ab6afd0d00746 (diff)
downloadlinux-1568d9f425c3fd54ac8d807cf1cbf87ad6b40b27.tar.bz2
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull one more DMA-mapping fix from Marek Szyprowski: "This patch fixes very subtle bug (typical off-by-one error) which might appear in very rare circumstances." * 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: arm: mm: fix DMA pool affiliation check
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 051204fc4617..e59c4ab71bcb 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -489,7 +489,7 @@ static bool __in_atomic_pool(void *start, size_t size)
void *pool_start = pool->vaddr;
void *pool_end = pool->vaddr + pool->size;
- if (start < pool_start || start > pool_end)
+ if (start < pool_start || start >= pool_end)
return false;
if (end <= pool_end)