diff --git a/[refs] b/[refs]
index 6bd33a0b9e20..7b590ab7deb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85c9fe8fcaf630225b26047b3a7cc5167739eced
+refs/heads/master: e269b085175acf03fc687a7416b9fd84aa9c6c23
diff --git a/trunk/include/linux/iommu-helper.h b/trunk/include/linux/iommu-helper.h
index 64d1b638745d..86bdeffe43ad 100644
--- a/trunk/include/linux/iommu-helper.h
+++ b/trunk/include/linux/iommu-helper.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_IOMMU_HELPER_H
 #define _LINUX_IOMMU_HELPER_H
 
+#include <linux/kernel.h>
+
 static inline unsigned long iommu_device_max_index(unsigned long size,
 						   unsigned long offset,
 						   u64 dma_mask)
@@ -20,7 +22,13 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
 				      unsigned long boundary_size,
 				      unsigned long align_mask);
 
-extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len,
-				     unsigned long io_page_size);
+static inline unsigned long iommu_num_pages(unsigned long addr,
+					    unsigned long len,
+					    unsigned long io_page_size)
+{
+	unsigned long size = (addr & (io_page_size - 1)) + len;
+
+	return DIV_ROUND_UP(size, io_page_size);
+}
 
 #endif
diff --git a/trunk/lib/iommu-helper.c b/trunk/lib/iommu-helper.c
index c0251f4ad08b..da053313ee5c 100644
--- a/trunk/lib/iommu-helper.c
+++ b/trunk/lib/iommu-helper.c
@@ -38,12 +38,3 @@ unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
 	return -1;
 }
 EXPORT_SYMBOL(iommu_area_alloc);
-
-unsigned long iommu_num_pages(unsigned long addr, unsigned long len,
-			      unsigned long io_page_size)
-{
-	unsigned long size = (addr & (io_page_size - 1)) + len;
-
-	return DIV_ROUND_UP(size, io_page_size);
-}
-EXPORT_SYMBOL(iommu_num_pages);