diff options
| author | Stephen Rothwell | 2006-05-19 08:51:57 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2006-05-24 08:08:56 +0200 |
| commit | 403fac4f83bd8e089a192c542511fbeb2729a6c5 (patch) | |
| tree | f33cf1d6caee0cb7edaa977ec8cc5d6f340d93b7 /arch/powerpc/platforms/iseries/iommu.c | |
| parent | [PATCH] powerpc: remove Irq from pci_dn (diff) | |
| download | kernel-qcow2-linux-403fac4f83bd8e089a192c542511fbeb2729a6c5.tar.gz kernel-qcow2-linux-403fac4f83bd8e089a192c542511fbeb2729a6c5.tar.xz kernel-qcow2-linux-403fac4f83bd8e089a192c542511fbeb2729a6c5.zip | |
[PATCH] powerpc: remove LogicalSlot from pci_dn
As we now store enough information in the device_node.
Also the Flags field was not used either, do remove that.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/iseries/iommu.c')
| -rw-r--r-- | arch/powerpc/platforms/iseries/iommu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c index 75a5a1e8abb8..a992f6af249f 100644 --- a/arch/powerpc/platforms/iseries/iommu.c +++ b/arch/powerpc/platforms/iseries/iommu.c @@ -162,10 +162,13 @@ void iommu_devnode_init_iSeries(struct device_node *dn) { struct iommu_table *tbl; struct pci_dn *pdn = PCI_DN(dn); + u32 *lsn = (u32 *)get_property(dn, "linux,logical-slot-number", NULL); + + BUG_ON(lsn == NULL); tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL); - iommu_table_getparms_iSeries(pdn->busno, pdn->LogicalSlot, 0, tbl); + iommu_table_getparms_iSeries(pdn->busno, *lsn, 0, tbl); /* Look for existing tce table */ pdn->iommu_table = iommu_table_find(tbl); |