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 ../linus
[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
a992f6a
..
e3bd201
100644
(file)
--- a/
arch/powerpc/platforms/iseries/iommu.c
+++ b/
arch/powerpc/platforms/iseries/iommu.c
@@
-173,7
+173,7
@@
void iommu_devnode_init_iSeries(struct device_node *dn)
/* Look for existing tce table */
pdn->iommu_table = iommu_table_find(tbl);
if (pdn->iommu_table == NULL)
- pdn->iommu_table = iommu_init_table(tbl);
+ pdn->iommu_table = iommu_init_table(tbl
, -1
);
else
kfree(tbl);
}