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 branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
iseries
/
iommu.c
diff --git
a/arch/powerpc/platforms/iseries/iommu.c
b/arch/powerpc/platforms/iseries/iommu.c
index
6c1e101
..
9d53cb4
100644
(file)
--- a/
arch/powerpc/platforms/iseries/iommu.c
+++ b/
arch/powerpc/platforms/iseries/iommu.c
@@
-193,7
+193,7
@@
static void pci_dma_dev_setup_iseries(struct pci_dev *pdev)
pdn->iommu_table = iommu_init_table(tbl, -1);
else
kfree(tbl);
-
pdev->dev.archdata.dma_data = pdn->iommu_table
;
+
set_iommu_table_base(&pdev->dev, pdn->iommu_table)
;
}
#else
#define pci_dma_dev_setup_iseries NULL