Merge branch 'core/iommu' into core/urgent

[linux-2.6-omap-h63xx.git] / lib / swiotlb.c

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index ef3cfe58a1578c9cb2ef71f684fc245e3fc0bf29..48deef7e1976b9eb03f266d994ccac220a875abf 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);
 }