diff --git a/[refs] b/[refs]
index ea758cbbec95..89d365d6ab2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f98eee8ea99fe74ee9c4e867ba178ec3072793be
+refs/heads/master: 07716e4df25523bf85b4e304d2cf63dbf3cbabf9
diff --git a/trunk/arch/ia64/kernel/pci-swiotlb.c b/trunk/arch/ia64/kernel/pci-swiotlb.c
index e6b2ec9b27da..d21dea44e76f 100644
--- a/trunk/arch/ia64/kernel/pci-swiotlb.c
+++ b/trunk/arch/ia64/kernel/pci-swiotlb.c
@@ -33,7 +33,7 @@ struct dma_map_ops swiotlb_dma_ops = {
 	.mapping_error = swiotlb_dma_mapping_error,
 };
 
-void swiotlb_dma_init(void)
+void __init swiotlb_dma_init(void)
 {
 	dma_ops = &swiotlb_dma_ops;
 	swiotlb_init();