mlx4: add rx_alloc_pages counter in ethtool -S

[karo-tx-linux.git] / mm / dmapool.c

diff --git a/mm/dmapool.c b/mm/dmapool.c
index abcbfe86c25ae12271d96418c5dfb4a592f334d8..4d90a64b2fdc8d50af4ef60278901a5b089b5735 100644 (file)
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -93,7 +93,7 @@ show_pools(struct device *dev, struct device_attribute *attr, char *buf)
                spin_unlock_irq(&pool->lock);
 
                /* per-pool info, no real statistics yet */
-               temp = scnprintf(next, size, "%-16s %4u %4Zu %4Zu %2u\n",
+               temp = scnprintf(next, size, "%-16s %4u %4zu %4zu %2u\n",
                                 pool->name, blocks,
                                 pages * (pool->allocation / pool->size),
                                 pool->size, pages);
@@ -434,11 +434,11 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma)
                spin_unlock_irqrestore(&pool->lock, flags);
                if (pool->dev)
                        dev_err(pool->dev,
-                               "dma_pool_free %s, %p (bad vaddr)/%Lx\n",
-                               pool->name, vaddr, (unsigned long long)dma);
+                               "dma_pool_free %s, %p (bad vaddr)/%pad\n",
+                               pool->name, vaddr, &dma);
                else
-                       pr_err("dma_pool_free %s, %p (bad vaddr)/%Lx\n",
-                              pool->name, vaddr, (unsigned long long)dma);
+                       pr_err("dma_pool_free %s, %p (bad vaddr)/%pad\n",
+                              pool->name, vaddr, &dma);
                return;
        }
        {
@@ -450,11 +450,11 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma)
                        }
                        spin_unlock_irqrestore(&pool->lock, flags);
                        if (pool->dev)
-                               dev_err(pool->dev, "dma_pool_free %s, dma %Lx already free\n",
-                                       pool->name, (unsigned long long)dma);
+                               dev_err(pool->dev, "dma_pool_free %s, dma %pad already free\n",
+                                       pool->name, &dma);
                        else
-                               pr_err("dma_pool_free %s, dma %Lx already free\n",
-                                      pool->name, (unsigned long long)dma);
+                               pr_err("dma_pool_free %s, dma %pad already free\n",
+                                      pool->name, &dma);
                        return;
                }
        }