git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
dma.c
diff --git
a/arch/powerpc/kernel/dma.c
b/arch/powerpc/kernel/dma.c
index
20a60d6
..
ccf129d
100644
(file)
--- a/
arch/powerpc/kernel/dma.c
+++ b/
arch/powerpc/kernel/dma.c
@@
-7,6
+7,7
@@
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
+#include <linux/lmb.h>
#include <asm/bug.h>
#include <asm/abs_addr.h>
#include <asm/bug.h>
#include <asm/abs_addr.h>
@@
-90,11
+91,10
@@
static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
static int dma_direct_dma_supported(struct device *dev, u64 mask)
{
#ifdef CONFIG_PPC64
static int dma_direct_dma_supported(struct device *dev, u64 mask)
{
#ifdef CONFIG_PPC64
- /* Could be improved to check for memory though it better be
- * done via some global so platforms can set the limit in case
+ /* Could be improved so platforms can set the limit in case
* they have limited DMA windows
*/
* they have limited DMA windows
*/
- return mask >=
DMA_BIT_MASK(32
);
+ return mask >=
(lmb_end_of_DRAM() - 1
);
#else
return 1;
#endif
#else
return 1;
#endif