From c6aeefe2bd6ced748e0e3ae89a0910a1c2876bea Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 5 Aug 2008 13:01:31 -0700 Subject: [PATCH] --- yaml --- r: 107680 b: refs/heads/master c: d2dc1f4adb4b5b02d87e49e115e5107f4da790c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/dma-coherent.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8590e68f873e..f5d7cfc6deb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 978cc90c469b38bcbbfd00a8c183d74e5b17bf45 +refs/heads/master: d2dc1f4adb4b5b02d87e49e115e5107f4da790c0 diff --git a/trunk/kernel/dma-coherent.c b/trunk/kernel/dma-coherent.c index 7517115a8cce..91e96950cd52 100644 --- a/trunk/kernel/dma-coherent.c +++ b/trunk/kernel/dma-coherent.c @@ -77,15 +77,14 @@ void *dma_mark_declared_memory_occupied(struct device *dev, { struct dma_coherent_mem *mem = dev->dma_mem; int pos, err; - int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1); - pages >>= PAGE_SHIFT; + size += device_addr & ~PAGE_MASK; if (!mem) return ERR_PTR(-EINVAL); pos = (device_addr - mem->device_base) >> PAGE_SHIFT; - err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages)); + err = bitmap_allocate_region(mem->bitmap, pos, get_order(size)); if (err != 0) return ERR_PTR(err); return mem->virt_base + (pos << PAGE_SHIFT);