Commit 1568d9f4 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 1c23ce72 f3d87524
...@@ -489,7 +489,7 @@ static bool __in_atomic_pool(void *start, size_t size) ...@@ -489,7 +489,7 @@ static bool __in_atomic_pool(void *start, size_t size)
void *pool_start = pool->vaddr; void *pool_start = pool->vaddr;
void *pool_end = pool->vaddr + pool->size; void *pool_end = pool->vaddr + pool->size;
if (start < pool_start || start > pool_end) if (start < pool_start || start >= pool_end)
return false; return false;
if (end <= pool_end) if (end <= pool_end)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment