Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)
  powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
  powerpc/pseries: Fix VPHN build errors on non-SMP systems
  powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
  powerpc/83xx: add DMA controller to mpc8308 device-tree node
  powerpc/512x: try to free dma descriptors in case of allocation failure
  powerpc/512x: add MPC8308 dma support
  powerpc/512x: fix the hanged dma transfer issue
  powerpc/512x: scatter/gather dma fix
  powerpc/powermac: Make auto-loading of therm_pm72 possible
  of/address: Use propper endianess in get_flags
  powerpc/pci: Use printf extension %pR for struct resource
  powerpc: Remove unnecessary casts of void ptr
  powerpc: Disable VPHN polling during a suspend operation
  powerpc/pseries: Poll VPA for topology changes and update NUMA maps
  powerpc: iommu: Add device name to iommu error printks
  powerpc: Record vma->phys_addr in ioremap()
  powerpc: Update compat_arch_ptrace
  powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
  powerpc/time: printk time stamp init not correct
  powerpc: Minor cleanups for machdep.h
  ...

1 files changed, 8 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index d5839179ec77..961bb03413f3 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -311,8 +311,9 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
                 /* Handle failure */
                 if (unlikely(entry == DMA_ERROR_CODE)) {
                         if (printk_ratelimit())
-                                printk(KERN_INFO "iommu_alloc failed, tbl %p vaddr %lx"
-                                       " npages %lx\n", tbl, vaddr, npages);
+                                dev_info(dev, "iommu_alloc failed, tbl %p "
+                                         "vaddr %lx npages %lu\n", tbl, vaddr,
+                                         npages);
                         goto failure;
                 }
 
@@ -579,9 +580,9 @@ dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,
                                          attrs);
                 if (dma_handle == DMA_ERROR_CODE) {
                         if (printk_ratelimit())  {
-                                printk(KERN_INFO "iommu_alloc failed, "
-                                                "tbl %p vaddr %p npages %d\n",
-                                                tbl, vaddr, npages);
+                                dev_info(dev, "iommu_alloc failed, tbl %p "
+                                         "vaddr %p npages %d\n", tbl, vaddr,
+                                         npages);
                         }
                 } else
                         dma_handle |= (uaddr & ~IOMMU_PAGE_MASK);
@@ -627,7 +628,8 @@ void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl,
          * the tce tables.
          */
         if (order >= IOMAP_MAX_ORDER) {
-                printk("iommu_alloc_consistent size too large: 0x%lx\n", size);
+                dev_info(dev, "iommu_alloc_consistent size too large: 0x%lx\n",
+                         size);
                 return NULL;
         }