iwlwifi: 3945 extract flow handler definitions into iwl-3945-fh.h

[mv-sheeva.git] / lib / swiotlb.c

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index ef3cfe58a1578c9cb2ef71f684fc245e3fc0bf29..1f991acc2a057acf65728448a5c3488d8e963351 100644 (file)
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -114,7 +114,7 @@ setup_io_tlb_npages(char *str)
 __setup("swiotlb=", setup_io_tlb_npages);
 /* make io_tlb_overflow tunable too? */
 
-void * __weak swiotlb_alloc_boot(size_t size, unsigned long nslabs)
+void * __weak __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
 {
        return alloc_bootmem_low_pages(size);
 }
@@ -619,7 +619,7 @@ swiotlb_full(struct device *dev, size_t size, int dir, int do_panic)
         * the damage, or panic when the transfer is too big.
         */
        printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at "
-              "device %s\n", size, dev ? dev->bus_id : "?");
+              "device %s\n", size, dev ? dev_name(dev) : "?");
 
        if (size > io_tlb_overflow && do_panic) {
                if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)