From cf904d08bbb3fa6aa46accabf0aa6704d1ae39dc Mon Sep 17 00:00:00 2001
From: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Wed, 15 Sep 2010 08:05:46 +0000
Subject: [PATCH] --- yaml --- r: 212868 b: refs/heads/master c:
 ffa56e555a6e4c205e879636e6cd6104ce03421f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e1198de02f36..115527d1de3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cb8e85a9d9da4192acfb5f70a80b0c5ce8c3e8f
+refs/heads/master: ffa56e555a6e4c205e879636e6cd6104ce03421f
diff --git a/trunk/arch/powerpc/kernel/dma.c b/trunk/arch/powerpc/kernel/dma.c
index f368c075c90b..cf02cad62d9a 100644
--- a/trunk/arch/powerpc/kernel/dma.c
+++ b/trunk/arch/powerpc/kernel/dma.c
@@ -90,7 +90,7 @@ static int dma_direct_dma_supported(struct device *dev, u64 mask)
 	/* Could be improved so platforms can set the limit in case
 	 * they have limited DMA windows
 	 */
-	return mask >= (memblock_end_of_DRAM() - 1);
+	return mask >= get_dma_offset(dev) + (memblock_end_of_DRAM() - 1);
 #else
 	return 1;
 #endif