projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[linux-2.6-block.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
iommu.c
diff --git
a/arch/powerpc/platforms/pseries/iommu.c
b/arch/powerpc/platforms/pseries/iommu.c
index 5fe77ac2e95537ec64b991794a4c69a28ca05871..06f02960b4392386375b5b4d87eb604cf7465438 100644
(file)
--- a/
arch/powerpc/platforms/pseries/iommu.c
+++ b/
arch/powerpc/platforms/pseries/iommu.c
@@
-1231,7
+1231,7
@@
static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
if (dma_offset != 0) {
dev_info(dev, "Using 64-bit direct DMA at offset %llx\n", dma_offset);
set_dma_offset(dev, dma_offset);
- set_dma_ops(dev, &dma_
direct
_ops);
+ set_dma_ops(dev, &dma_
nommu
_ops);
ddw_enabled = true;
}
}