fbdev: fix fb_compat_ioctl() deadlocks

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

diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c
index 889ddce2021e26870b0b287ad0d28e7032e99028..75dbda03f4fb99a92ef8cc3ead817afefd707702 100644 (file)
--- a/lib/iommu-helper.c
+++ b/lib/iommu-helper.c
@@ -30,8 +30,7 @@ again:
        return index;
 }
 
-static inline void set_bit_area(unsigned long *map, unsigned long i,
-                               int len)
+void iommu_area_reserve(unsigned long *map, unsigned long i, int len)
 {
        unsigned long end = i + len;
        while (i < end) {
@@ -64,7 +63,7 @@ again:
                        start = index + 1;
                        goto again;
                }
-               set_bit_area(map, index, nr);
+               iommu_area_reserve(map, index, nr);
        }
        return index;
 }
@@ -81,10 +80,11 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
 }
 EXPORT_SYMBOL(iommu_area_free);
 
-unsigned long iommu_num_pages(unsigned long addr, unsigned long len)
+unsigned long iommu_num_pages(unsigned long addr, unsigned long len,
+                             unsigned long io_page_size)
 {
-       unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);
+       unsigned long size = (addr & (io_page_size - 1)) + len;
 
-       return size >> PAGE_SHIFT;
+       return DIV_ROUND_UP(size, io_page_size);
 }
 EXPORT_SYMBOL(iommu_num_pages);