|
@@ -14,6 +14,7 @@
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/list.h>
|
|
|
#include <linux/init.h>
|
|
|
+#include <linux/bitmap.h>
|
|
|
|
|
|
#include <asm/hypervisor.h>
|
|
|
#include <asm/iommu.h>
|
|
@@ -1875,7 +1876,7 @@ EXPORT_SYMBOL(ldc_read);
|
|
|
static long arena_alloc(struct ldc_iommu *iommu, unsigned long npages)
|
|
|
{
|
|
|
struct iommu_arena *arena = &iommu->arena;
|
|
|
- unsigned long n, i, start, end, limit;
|
|
|
+ unsigned long n, start, end, limit;
|
|
|
int pass;
|
|
|
|
|
|
limit = arena->limit;
|
|
@@ -1883,7 +1884,7 @@ static long arena_alloc(struct ldc_iommu *iommu, unsigned long npages)
|
|
|
pass = 0;
|
|
|
|
|
|
again:
|
|
|
- n = find_next_zero_bit(arena->map, limit, start);
|
|
|
+ n = bitmap_find_next_zero_area(arena->map, limit, start, npages, 0);
|
|
|
end = n + npages;
|
|
|
if (unlikely(end >= limit)) {
|
|
|
if (likely(pass < 1)) {
|
|
@@ -1896,16 +1897,7 @@ again:
|
|
|
return -1;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- for (i = n; i < end; i++) {
|
|
|
- if (test_bit(i, arena->map)) {
|
|
|
- start = i + 1;
|
|
|
- goto again;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- for (i = n; i < end; i++)
|
|
|
- __set_bit(i, arena->map);
|
|
|
+ bitmap_set(arena->map, n, npages);
|
|
|
|
|
|
arena->hint = end;
|
|
|
|