.. | .. |
---|
185 | 185 | bitmap->avail = num - reserved_top - reserved_bot; |
---|
186 | 186 | bitmap->effective_len = bitmap->avail; |
---|
187 | 187 | spin_lock_init(&bitmap->lock); |
---|
188 | | - bitmap->table = kcalloc(BITS_TO_LONGS(bitmap->max), sizeof(long), |
---|
189 | | - GFP_KERNEL); |
---|
| 188 | + bitmap->table = bitmap_zalloc(bitmap->max, GFP_KERNEL); |
---|
190 | 189 | if (!bitmap->table) |
---|
191 | 190 | return -ENOMEM; |
---|
192 | 191 | |
---|
.. | .. |
---|
197 | 196 | |
---|
198 | 197 | void mlx4_bitmap_cleanup(struct mlx4_bitmap *bitmap) |
---|
199 | 198 | { |
---|
200 | | - kfree(bitmap->table); |
---|
| 199 | + bitmap_free(bitmap->table); |
---|
201 | 200 | } |
---|
202 | 201 | |
---|
203 | 202 | struct mlx4_zone_allocator { |
---|
.. | .. |
---|
584 | 583 | buf->npages = 1; |
---|
585 | 584 | buf->page_shift = get_order(size) + PAGE_SHIFT; |
---|
586 | 585 | buf->direct.buf = |
---|
587 | | - dma_zalloc_coherent(&dev->persist->pdev->dev, |
---|
588 | | - size, &t, GFP_KERNEL); |
---|
| 586 | + dma_alloc_coherent(&dev->persist->pdev->dev, size, &t, |
---|
| 587 | + GFP_KERNEL); |
---|
589 | 588 | if (!buf->direct.buf) |
---|
590 | 589 | return -ENOMEM; |
---|
591 | 590 | |
---|
.. | .. |
---|
614 | 613 | int i; |
---|
615 | 614 | |
---|
616 | 615 | buf->direct.buf = NULL; |
---|
617 | | - buf->nbufs = (size + PAGE_SIZE - 1) / PAGE_SIZE; |
---|
| 616 | + buf->nbufs = DIV_ROUND_UP(size, PAGE_SIZE); |
---|
618 | 617 | buf->npages = buf->nbufs; |
---|
619 | 618 | buf->page_shift = PAGE_SHIFT; |
---|
620 | 619 | buf->page_list = kcalloc(buf->nbufs, sizeof(*buf->page_list), |
---|
.. | .. |
---|
624 | 623 | |
---|
625 | 624 | for (i = 0; i < buf->nbufs; ++i) { |
---|
626 | 625 | buf->page_list[i].buf = |
---|
627 | | - dma_zalloc_coherent(&dev->persist->pdev->dev, |
---|
628 | | - PAGE_SIZE, &t, GFP_KERNEL); |
---|
| 626 | + dma_alloc_coherent(&dev->persist->pdev->dev, |
---|
| 627 | + PAGE_SIZE, &t, GFP_KERNEL); |
---|
629 | 628 | if (!buf->page_list[i].buf) |
---|
630 | 629 | goto err_free; |
---|
631 | 630 | |
---|