From fb6fb5b2602568724f3872caef5f785f9a58f9f1 Mon Sep 17 00:00:00 2001
From: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Date: Wed, 21 Jan 2009 18:47:38 +0900
Subject: [PATCH] --- yaml --- r: 130057 b: refs/heads/master c:
 cdf57cab27aef72f13a19c86858c6cac9951dc24 h: refs/heads/master i:   130055:
 b84384925f8e76cc563554a756ff6213a6f2e1a4 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/dma-coherent.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4deb0fc65532..1b905241654a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2afb447f33c29cb000a494396559f8005d3e33c1
+refs/heads/master: cdf57cab27aef72f13a19c86858c6cac9951dc24
diff --git a/trunk/kernel/dma-coherent.c b/trunk/kernel/dma-coherent.c
index 038707404b76..38fa292c6aa9 100644
--- a/trunk/kernel/dma-coherent.c
+++ b/trunk/kernel/dma-coherent.c
@@ -118,8 +118,8 @@ int dma_alloc_from_coherent(struct device *dev, ssize_t size,
 	mem = dev->dma_mem;
 	if (!mem)
 		return 0;
-	if (unlikely(size > mem->size))
- 		return 0;
+	if (unlikely(size > (mem->size << PAGE_SHIFT)))
+		return 0;
 
 	pageno = bitmap_find_free_region(mem->bitmap, mem->size, order);
 	if (pageno >= 0) {