---

yaml --- r: 212868 b: refs/heads/master c: ffa56e5 h: refs/heads/master v: v3
git-mirror · Oct 13, 2010 · cf904d0 · cf904d0
1 parent e2bc901
commit cf904d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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