Skip to content

Commit

Permalink
[PATCH] ppc64: Fix build with iommu debug enabled
Browse files Browse the repository at this point in the history 
Fix build when iommu debug is enabled.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
@antonblanchard
antonblanchard authored and Linus Torvalds committed Sep 23, 2005
1 parent 586a90e commit f951da3
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions arch/ppc64/kernel/pSeries_iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)

while (pci->phb->dma_window_size * children > 0x80000000ul)
pci->phb->dma_window_size >>= 1;
DBG("No ISA/IDE, window size is %x\n", pci->phb->dma_window_size);
DBG("No ISA/IDE, window size is 0x%lx\n",
pci->phb->dma_window_size);
pci->phb->dma_window_base_cur = 0;

return;
Expand All @@ -388,7 +389,7 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
while (pci->phb->dma_window_size * children > 0x70000000ul)
pci->phb->dma_window_size >>= 1;

DBG("ISA/IDE, window size is %x\n", pci->phb->dma_window_size);
DBG("ISA/IDE, window size is 0x%lx\n", pci->phb->dma_window_size);

}

Expand Down Expand Up @@ -442,7 +443,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
struct device_node *dn, *mydn;
struct iommu_table *tbl;

DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, dev->pretty_name);
DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, pci_name(dev));

mydn = dn = pci_device_to_OF_node(dev);

Expand All @@ -469,7 +470,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
if (dn && dn->data) {
PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table;
} else {
DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, dev->pretty_name);
DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, pci_name(dev));
}
}

Expand Down Expand Up @@ -503,7 +504,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
int *dma_window = NULL;
struct pci_dn *pci;

DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, dev->pretty_name);
DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev));

/* dev setup for LPAR is a little tricky, since the device tree might
* contain the dma-window properties per-device and not neccesarily
Expand Down

0 comments on commit f951da3

Please sign in to comment.