diff options
author | Anton Blanchard <anton@samba.org> | 2005-09-23 00:44:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 01:17:35 -0400 |
commit | f951da3757cf46444a6ea52e97b8aa9400fe761a (patch) | |
tree | 1bcbfc0c595ce7c08b7a6242a781e7c623b428f5 | |
parent | 586a90eb4c0b512df766e08a7718af7c6b9b2dcf (diff) |
[PATCH] ppc64: Fix build with iommu debug enabled
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>
-rw-r--r-- | arch/ppc64/kernel/pSeries_iommu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c index 25d6c7eebfd0..d17f0108a032 100644 --- a/arch/ppc64/kernel/pSeries_iommu.c +++ b/arch/ppc64/kernel/pSeries_iommu.c | |||
@@ -364,7 +364,8 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus) | |||
364 | 364 | ||
365 | while (pci->phb->dma_window_size * children > 0x80000000ul) | 365 | while (pci->phb->dma_window_size * children > 0x80000000ul) |
366 | pci->phb->dma_window_size >>= 1; | 366 | pci->phb->dma_window_size >>= 1; |
367 | DBG("No ISA/IDE, window size is %x\n", pci->phb->dma_window_size); | 367 | DBG("No ISA/IDE, window size is 0x%lx\n", |
368 | pci->phb->dma_window_size); | ||
368 | pci->phb->dma_window_base_cur = 0; | 369 | pci->phb->dma_window_base_cur = 0; |
369 | 370 | ||
370 | return; | 371 | return; |
@@ -388,7 +389,7 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus) | |||
388 | while (pci->phb->dma_window_size * children > 0x70000000ul) | 389 | while (pci->phb->dma_window_size * children > 0x70000000ul) |
389 | pci->phb->dma_window_size >>= 1; | 390 | pci->phb->dma_window_size >>= 1; |
390 | 391 | ||
391 | DBG("ISA/IDE, window size is %x\n", pci->phb->dma_window_size); | 392 | DBG("ISA/IDE, window size is 0x%lx\n", pci->phb->dma_window_size); |
392 | 393 | ||
393 | } | 394 | } |
394 | 395 | ||
@@ -442,7 +443,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev) | |||
442 | struct device_node *dn, *mydn; | 443 | struct device_node *dn, *mydn; |
443 | struct iommu_table *tbl; | 444 | struct iommu_table *tbl; |
444 | 445 | ||
445 | DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, dev->pretty_name); | 446 | DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, pci_name(dev)); |
446 | 447 | ||
447 | mydn = dn = pci_device_to_OF_node(dev); | 448 | mydn = dn = pci_device_to_OF_node(dev); |
448 | 449 | ||
@@ -469,7 +470,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev) | |||
469 | if (dn && dn->data) { | 470 | if (dn && dn->data) { |
470 | PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table; | 471 | PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table; |
471 | } else { | 472 | } else { |
472 | DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, dev->pretty_name); | 473 | DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, pci_name(dev)); |
473 | } | 474 | } |
474 | } | 475 | } |
475 | 476 | ||
@@ -503,7 +504,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev) | |||
503 | int *dma_window = NULL; | 504 | int *dma_window = NULL; |
504 | struct pci_dn *pci; | 505 | struct pci_dn *pci; |
505 | 506 | ||
506 | DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, dev->pretty_name); | 507 | DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev)); |
507 | 508 | ||
508 | /* dev setup for LPAR is a little tricky, since the device tree might | 509 | /* dev setup for LPAR is a little tricky, since the device tree might |
509 | * contain the dma-window properties per-device and not neccesarily | 510 | * contain the dma-window properties per-device and not neccesarily |